Merge branch 'main' into avm99963-monorail

Merged commit 34d8229ae2b51fb1a15bd208e6fe6185c94f6266

GitOrigin-RevId: 7ee0917f93a577e475f8e09526dd144d245593f4
diff --git a/tracker/issuetips.py b/tracker/issuetips.py
index f85bcd6..2b337e8 100644
--- a/tracker/issuetips.py
+++ b/tracker/issuetips.py
@@ -1,25 +1,21 @@
-# Copyright 2016 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file or at
-# https://developers.google.com/open-source/licenses/bsd
+# Copyright 2016 The Chromium Authors
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
 
 """A class to render a page of issue tracker search tips."""
 from __future__ import print_function
 from __future__ import division
 from __future__ import absolute_import
 
-import logging
-
-from framework import flaskservlet
-from framework import servlet
 from framework import permissions
+from framework import servlet
 
 
 class IssueSearchTips(servlet.Servlet):
   """IssueSearchTips on-line help on how to use issue search."""
 
   _PAGE_TEMPLATE = 'tracker/issue-search-tips.ezt'
-  _MAIN_TAB_MODE = flaskservlet.FlaskServlet.MAIN_TAB_ISSUES
+  _MAIN_TAB_MODE = servlet.Servlet.MAIN_TAB_ISSUES
 
   def GatherPageData(self, mr):
     """Build up a dictionary of data values to use when rendering the page."""
@@ -29,5 +25,5 @@
         'page_perms': self.MakePagePerms(mr, None, permissions.CREATE_ISSUE),
     }
 
-  # def GetIssueSearchTips(self, **kwargs):
-  #   return self.handler(**kwargs)
+  def GetIssueSearchTips(self, **kwargs):
+    return self.handler(**kwargs)