Only use new login flow for GmailSmoothPage

tools/perf/page_sets/top_25_smooth.py

 # Copyright 2014 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.
 from telemetry.page import page as page_module
 from telemetry.page import shared_page_state
 from telemetry import story
 
+from page_sets.login_helpers import google_login
 from page_sets import top_pages
 
 
 def _IssueMarkerAndScroll(action_runner):
   with action_runner.CreateGestureInteraction('ScrollAction'):
     action_runner.ScrollPage()
 
 
 def _CreatePageClassWithSmoothInteractions(page_cls):
   class DerivedSmoothPage(page_cls):  # pylint: disable=no-init
 
     def RunPageInteractions(self, action_runner):
       _IssueMarkerAndScroll(action_runner)
   return DerivedSmoothPage
 
 
 class TopSmoothPage(page_module.Page):
 
   def __init__(self, url, page_set, name='', credentials=None):
     super(TopSmoothPage, self).__init__(
         url=url, page_set=page_set, name=name,
         shared_page_state_class=shared_page_state.SharedDesktopPageState,
         credentials_path='data/credentials.json')
     self.credentials = credentials
 
   def RunPageInteractions(self, action_runner):
     _IssueMarkerAndScroll(action_runner)
 
 
-class GmailSmoothPage(top_pages.GmailPage):
+class GmailSmoothPage(top_pages.TopPages):
 
   """ Why: productivity, top google properties """
 
+  def __init__(self, page_set,
+               shared_page_state_class=shared_page_state.SharedPageState):
+    # TODO(flackr): This is duplicating page logic from top_pages.py but is
+    # the only way to update https://mail.google.com/mail/ for this test without
+    # updating the 14 other recordings, as the gmail login flow has changed.
+    # https://crbug.com/590766 tracks updating google_login.py to support
+    # legacy and new login flow.
+    super(GmailSmoothPage, self).__init__(
+        url='https://mail.google.com/mail/',
+        page_set=page_set,
+        shared_page_state_class=shared_page_state_class)
+
+  def RunNavigateSteps(self, action_runner):
+    google_login.LoginGoogleAccount(action_runner, 'google3',
+                                    self.credentials_path)
+    super(GmailSmoothPage, self).RunNavigateSteps(action_runner)
+    action_runner.WaitForJavaScriptCondition(
+        'window.gmonkey !== undefined &&'
+        'document.getElementById("gb") !== null',
+        timeout_in_seconds=120)
+
   def RunPageInteractions(self, action_runner):
     action_runner.ExecuteJavaScript('''
         gmonkey.load('2.0', function(api) {
           window.__scrollableElementForTelemetry = api.getScrollableElement();
         });''')
     action_runner.WaitForJavaScriptCondition(
         'window.__scrollableElementForTelemetry != null')
     with action_runner.CreateGestureInteraction('ScrollAction'):
       action_runner.ScrollElement(
           element_function='window.__scrollableElementForTelemetry')
@@ skipping 92 matching lines @@
       other_urls.append('http://techcrunch.com')
 
     for url in other_urls:
       self.AddStory(TopSmoothPage(url, self))
 
 
 class V8Top25SmoothPageSet(Top25SmoothPageSet):
   def __init__(self):
     # Disabled for V8 because of crbug.com/507836, crbug.com/527425
     super(V8Top25SmoothPageSet, self).__init__(techcrunch=False)