[Telemetry] Switch BeginGestureInteraction to CreateGestureInteraction.

tools/perf/page_sets/top_7_stress.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 page_set as page_set_module
 
 
 def _GetCurrentLocation(action_runner):
   return action_runner.EvaluateJavaScript('document.location.href')
 
@@ skipping 23 matching lines @@
   def __init__(self, page_set):
     super(GoogleWebSearchPage, self).__init__(
       url='https://www.google.com/#hl=en&q=barack+obama',
       page_set=page_set)
 
   def RunNavigateSteps(self, action_runner):
     super(GoogleWebSearchPage, self).RunNavigateSteps(action_runner)
     action_runner.WaitForElement(text='Next')
 
   def RunPageInteractions(self, action_runner):
-    interaction = action_runner.BeginGestureInteraction(
-        'ScrollAction')
-    action_runner.ScrollPage()
-    interaction.End()
+    with action_runner.CreateGestureInteraction('ScrollAction'):
+      action_runner.ScrollPage()
     old_href = _GetCurrentLocation(action_runner)
     action_runner.ClickElement(text='Next')
     _WaitForLocationChange(action_runner, old_href)
     action_runner.WaitForElement(text='Next')
-    interaction = action_runner.BeginGestureInteraction(
-        'ScrollAction')
-    action_runner.ScrollPage()
-    interaction.End()
+    with action_runner.CreateGestureInteraction('ScrollAction'):
+      action_runner.ScrollPage()
     old_href = _GetCurrentLocation(action_runner)
     action_runner.ClickElement(text='Next')
     _WaitForLocationChange(action_runner, old_href)
     action_runner.WaitForElement(text='Next')
-    interaction = action_runner.BeginGestureInteraction(
-        'ScrollAction')
-    action_runner.ScrollPage()
-    interaction.End()
+    with action_runner.CreateGestureInteraction('ScrollAction'):
+      action_runner.ScrollPage()
     old_href = _GetCurrentLocation(action_runner)
     action_runner.ClickElement(text='Next')
     _WaitForLocationChange(action_runner, old_href)
     action_runner.WaitForElement(text='Previous')
-    interaction = action_runner.BeginGestureInteraction(
-        'ScrollAction')
-    action_runner.ScrollPage()
-    interaction.End()
+    with action_runner.CreateGestureInteraction('ScrollAction'):
+      action_runner.ScrollPage()
     old_href = _GetCurrentLocation(action_runner)
     action_runner.ClickElement(text='Previous')
     _WaitForLocationChange(action_runner, old_href)
     action_runner.WaitForElement(text='Previous')
-    interaction = action_runner.BeginGestureInteraction(
-        'ScrollAction')
-    action_runner.ScrollPage()
-    interaction.End()
+    with action_runner.CreateGestureInteraction('ScrollAction'):
+      action_runner.ScrollPage()
     old_href = _GetCurrentLocation(action_runner)
     action_runner.ClickElement(text='Previous')
     _WaitForLocationChange(action_runner, old_href)
     action_runner.WaitForElement(text='Previous')
-    interaction = action_runner.BeginGestureInteraction(
-        'ScrollAction')
-    action_runner.ScrollPage()
-    interaction.End()
+    with action_runner.CreateGestureInteraction('ScrollAction'):
+      action_runner.ScrollPage()
     old_href = _GetCurrentLocation(action_runner)
     action_runner.ClickElement(text='Previous')
     _WaitForLocationChange(action_runner, old_href)
     action_runner.WaitForElement(text='Images')
-    interaction = action_runner.BeginGestureInteraction(
-        'ScrollAction')
-    action_runner.ScrollPage()
-    interaction.End()
+    with action_runner.CreateGestureInteraction('ScrollAction'):
+      action_runner.ScrollPage()
     old_href = _GetCurrentLocation(action_runner)
     action_runner.ClickElement(text='Images')
     _WaitForLocationChange(action_runner, old_href)
     action_runner.WaitForElement(text='Images')
 
 
 class GmailPage(Top7StressPage):
 
   """ Why: productivity, top google properties """
 
@@ skipping 116 matching lines @@
       page_set=page_set,
       name='Blogger')
 
   def RunNavigateSteps(self, action_runner):
     super(BlogspotPage, self).RunNavigateSteps(action_runner)
     action_runner.WaitForElement(text='accessibility')
 
   def RunPageInteractions(self, action_runner):
     action_runner.ClickElement(text='accessibility')
     action_runner.WaitForNavigate()
-    interaction = action_runner.BeginGestureInteraction(
-        'ScrollAction')
-    action_runner.ScrollPage()
-    interaction.End()
+    with action_runner.CreateGestureInteraction('ScrollAction'):
+      action_runner.ScrollPage()
     # Insert 300ms wait to simulate user finger movement,
     # and ensure scheduling of idle tasks.
     action_runner.Wait(0.3)
     action_runner.ClickElement(text='advanced')
     action_runner.WaitForNavigate()
-    interaction = action_runner.BeginGestureInteraction(
-        'ScrollAction')
-    action_runner.ScrollPage()
-    interaction.End()
+    with action_runner.CreateGestureInteraction('ScrollAction'):
+      action_runner.ScrollPage()
     action_runner.Wait(0.3)
     action_runner.ClickElement(text='beginner')
     action_runner.WaitForNavigate()
-    interaction = action_runner.BeginGestureInteraction(
-        'ScrollAction')
-    action_runner.ScrollPage()
-    interaction.End()
+    with action_runner.CreateGestureInteraction('ScrollAction'):
+      action_runner.ScrollPage()
     action_runner.Wait(0.3)
     action_runner.ClickElement(text='Home')
     action_runner.WaitForNavigate()
 
 
 class WordpressPage(Top7StressPage):
 
   """ Why: #18 (Alexa global), Picked an interesting post """
 
   def __init__(self, page_set):
     super(WordpressPage, self).__init__(
       # pylint: disable=C0301
       url='http://en.blog.wordpress.com/2012/09/04/freshly-pressed-editors-picks-for-august-2012/',
       page_set=page_set,
       name='Wordpress')
 
   def RunNavigateSteps(self, action_runner):
     super(WordpressPage, self).RunNavigateSteps(action_runner)
     action_runner.WaitForElement(
         # pylint: disable=C0301
         'a[href="http://en.blog.wordpress.com/2012/08/30/new-themes-able-and-sight/"]')
 
   def RunPageInteractions(self, action_runner):
-    interaction = action_runner.BeginGestureInteraction(
-        'ScrollAction')
-    action_runner.ScrollPage()
-    interaction.End()
+    with action_runner.CreateGestureInteraction('ScrollAction'):
+      action_runner.ScrollPage()
     # Insert 300ms wait to simulate user finger movement,
     # and ensure scheduling of idle tasks.
     action_runner.Wait(0.3)
     action_runner.ClickElement(
         # pylint: disable=C0301
         'a[href="http://en.blog.wordpress.com/2012/08/30/new-themes-able-and-sight/"]')
     action_runner.WaitForNavigate()
-    interaction = action_runner.BeginGestureInteraction(
-        'ScrollAction')
-    action_runner.ScrollPage()
-    interaction.End()
+    with action_runner.CreateGestureInteraction('ScrollAction'):
+      action_runner.ScrollPage()
     action_runner.Wait(0.3)
     action_runner.ClickElement(text='Features')
     action_runner.WaitForNavigate()
-    interaction = action_runner.BeginGestureInteraction(
-        'ScrollAction')
-    action_runner.ScrollPage()
-    interaction.End()
+    with action_runner.CreateGestureInteraction('ScrollAction'):
+      action_runner.ScrollPage()
     action_runner.Wait(0.3)
     action_runner.ClickElement(text='News')
     action_runner.WaitForNavigate()
-    interaction = action_runner.BeginGestureInteraction(
-        'ScrollAction')
-    action_runner.ScrollPage()
-    interaction.End()
+    with action_runner.CreateGestureInteraction('ScrollAction'):
+      action_runner.ScrollPage()
 
 
 class FacebookPage(Top7StressPage):
 
   """ Why: top social,Public profile """
 
   def __init__(self, page_set):
     super(FacebookPage, self).__init__(
       url='https://www.facebook.com/barackobama',
       page_set=page_set,
       name='Facebook')
     self.credentials = 'facebook2'
 
   def RunNavigateSteps(self, action_runner):
     super(FacebookPage, self).RunNavigateSteps(action_runner)
     action_runner.WaitForElement(text='About')
 
   def RunPageInteractions(self, action_runner):
     # Scroll and wait for the next page to be loaded.
-    interaction = action_runner.BeginGestureInteraction(
-        'ScrollAction')
-    action_runner.ScrollPage()
-    interaction.End()
+    with action_runner.CreateGestureInteraction('ScrollAction'):
+      action_runner.ScrollPage()
     action_runner.WaitForJavaScriptCondition(
         'document.documentElement.scrollHeight - window.innerHeight - '
         'window.pageYOffset > 0')
 
     # Scroll and wait again.
-    interaction = action_runner.BeginGestureInteraction(
-        'ScrollAction')
-    action_runner.ScrollPage()
-    interaction.End()
+    with action_runner.CreateGestureInteraction('ScrollAction'):
+      action_runner.ScrollPage()
     action_runner.WaitForJavaScriptCondition(
         'document.documentElement.scrollHeight - window.innerHeight - '
         'window.pageYOffset > 0')
 
 class Top7StressPageSet(page_set_module.PageSet):
 
   """ Pages hand-picked for stress testing. """
 
   def __init__(self):
     super(Top7StressPageSet, self).__init__(
       user_agent_type='desktop',
       archive_data_file='data/top_7_stress.json',
       bucket=page_set_module.PARTNER_BUCKET)
 
     self.AddUserStory(GoogleWebSearchPage(self))
     self.AddUserStory(GmailPage(self))
     self.AddUserStory(GoogleCalendarPage(self))
     self.AddUserStory(GooglePlusPage(self))
     self.AddUserStory(BlogspotPage(self))
     self.AddUserStory(WordpressPage(self))
     self.AddUserStory(FacebookPage(self))