CL for perf tryjob on android

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 page_set as page_set_module
 
 from page_sets import top_pages
 
 
 def _IssueMarkerAndScroll(action_runner):
-  interaction = action_runner.BeginGestureInteraction(
-      'ScrollAction')
-  action_runner.ScrollPage()
-  interaction.End()
+  with action_runner.CreateGestureInteraction('ScrollAction'):
+    action_runner.ScrollPage()
 
 
 def _CreatePageClassWithSmoothInteractions(page_cls):
   class DerivedSmoothPage(page_cls):  # pylint: disable=W0232
 
     def RunPageInteractions(self, action_runner):
       _IssueMarkerAndScroll(action_runner)
   return DerivedSmoothPage
 
 
@@ skipping 14 matching lines @@
 
   """ Why: productivity, top google properties """
 
   def RunPageInteractions(self, action_runner):
     action_runner.ExecuteJavaScript('''
         gmonkey.load('2.0', function(api) {
           window.__scrollableElementForTelemetry = api.getScrollableElement();
         });''')
     action_runner.WaitForJavaScriptCondition(
         'window.__scrollableElementForTelemetry != null')
-    interaction = action_runner.BeginGestureInteraction(
-        'ScrollAction')
-    action_runner.ScrollElement(
-        element_function='window.__scrollableElementForTelemetry')
-    interaction.End()
+    with action_runner.CreateGestureInteraction('ScrollAction'):
+      action_runner.ScrollElement(
+          element_function='window.__scrollableElementForTelemetry')
 
 
 class GoogleCalendarSmoothPage(top_pages.GoogleCalendarPage):
 
   """ Why: productivity, top google properties """
 
   def RunPageInteractions(self, action_runner):
-    interaction = action_runner.BeginGestureInteraction(
-        'ScrollAction')
-    action_runner.ScrollElement(selector='#scrolltimedeventswk')
-    interaction.End()
+    with action_runner.CreateGestureInteraction('ScrollAction'):
+      action_runner.ScrollElement(selector='#scrolltimedeventswk')
 
 
 class GoogleDocSmoothPage(top_pages.GoogleDocPage):
 
   """ Why: productivity, top google properties; Sample doc in the link """
 
   def RunPageInteractions(self, action_runner):
-    interaction = action_runner.BeginGestureInteraction(
-        'ScrollAction')
-    action_runner.ScrollElement(selector='.kix-appview-editor')
-    interaction.End()
+    with action_runner.CreateGestureInteraction('ScrollAction'):
+      action_runner.ScrollElement(selector='.kix-appview-editor')
 
 
 class ESPNSmoothPage(top_pages.ESPNPage):
 
   """ Why: #1 sports """
 
   def RunPageInteractions(self, action_runner):
-    interaction = action_runner.BeginGestureInteraction(
-        'ScrollAction')
-    action_runner.ScrollPage(left_start_ratio=0.1)
-    interaction.End()
+    with action_runner.CreateGestureInteraction('ScrollAction'):
+      action_runner.ScrollPage(left_start_ratio=0.1)
 
 
 class Top25SmoothPageSet(page_set_module.PageSet):
 
   """ Pages hand-picked for 2012 CrOS scrolling tuning efforts. """
 
   def __init__(self):
     super(Top25SmoothPageSet, self).__init__(
         user_agent_type='desktop',
         archive_data_file='data/top_25_smooth.json',
@@ skipping 45 matching lines @@
         # Why: #1 Alexa reference
         'http://answers.yahoo.com',
         # Why: #1 Alexa sports
         'http://sports.yahoo.com/',
         # Why: top tech blog
         'http://techcrunch.com'
     ]
 
     for url in other_urls:
       self.AddUserStory(TopSmoothPage(url, self))