CL for perf tryjob on android

tools/perf/page_sets/tough_pinch_zoom_cases.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
 
 
 class ToughPinchZoomCasesPage(page_module.Page):
 
   def __init__(self, url, page_set, name=''):
     super(ToughPinchZoomCasesPage, self).__init__(
         url=url, page_set=page_set, name=name,
         credentials_path = 'data/credentials.json')
     self.user_agent_type = 'desktop'
     self.archive_data_file = 'data/tough_pinch_zoom_cases.json'
 
   def RunPageInteractions(self, action_runner):
-    interaction = action_runner.BeginGestureInteraction(
-        'PinchAction')
-    action_runner.PinchPage()
-    interaction.End()
+    with action_runner.CreateGestureInteraction('PinchAction'):
+      action_runner.PinchPage()
 
 
 class GoogleSearchPage(ToughPinchZoomCasesPage):
 
   """ Why: top google property; a google tab is often open. """
 
   def __init__(self, page_set):
     super(GoogleSearchPage, self).__init__(
       url='https://www.google.com/#hl=en&q=barack+obama',
       page_set=page_set)
@@ skipping 30 matching lines @@
       url='https://www.google.com/calendar/',
       page_set=page_set)
 
     self.credentials = 'google'
 
   def RunNavigateSteps(self, action_runner):
     super(GoogleCalendarPage, self).RunNavigateSteps(action_runner)
     action_runner.Wait(2)
 
   def RunPageInteractions(self, action_runner):
-    interaction = action_runner.BeginGestureInteraction(
-        'PinchAction')
-    action_runner.PinchPage(left_anchor_ratio=0.1, top_anchor_ratio=0.3)
-    interaction.End()
+    with action_runner.CreateGestureInteraction('PinchAction'):
+      action_runner.PinchPage(left_anchor_ratio=0.1, top_anchor_ratio=0.3)
 
 
 class GoogleImageSearchPage(ToughPinchZoomCasesPage):
 
   """ Why: tough image case; top google properties """
 
   def __init__(self, page_set):
     super(GoogleImageSearchPage, self).__init__(
       url='https://www.google.com/search?q=cats&tbm=isch',
       page_set=page_set)
@@ skipping 10 matching lines @@
       url='https://plus.google.com/+BarackObama/posts',
       page_set=page_set)
 
     self.credentials = 'google'
 
   def RunNavigateSteps(self, action_runner):
     super(GooglePlusPage, self).RunNavigateSteps(action_runner)
     action_runner.WaitForElement(text='Home')
 
   def RunPageInteractions(self, action_runner):
-    interaction = action_runner.BeginGestureInteraction(
-        'PinchAction')
-    action_runner.PinchElement(selector='[id="110031535020051778989-tab-bar"]')
-    interaction.End()
+    with action_runner.CreateGestureInteraction('PinchAction'):
+      action_runner.PinchElement(
+          selector='[id="110031535020051778989-tab-bar"]')
 
 
 class YoutubePage(ToughPinchZoomCasesPage):
 
   """ Why: #3 (Alexa global) """
 
   def __init__(self, page_set):
     super(YoutubePage, self).__init__(
       url='http://www.youtube.com',
       page_set=page_set)
@@ skipping 107 matching lines @@
 class YahooAnswersPage(ToughPinchZoomCasesPage):
 
   """ Why: #1 Alexa reference """
 
   def __init__(self, page_set):
     super(YahooAnswersPage, self).__init__(
       url='http://answers.yahoo.com',
       page_set=page_set)
 
   def RunPageInteractions(self, action_runner):
-    interaction = action_runner.BeginGestureInteraction(
-        'PinchAction')
-    action_runner.PinchElement(selector='#ya-content-apps')
-    interaction.End()
+    with action_runner.CreateGestureInteraction('PinchAction'):
+      action_runner.PinchElement(selector='#ya-content-apps')
 
 
 class ToughPinchZoomCasesPageSet(page_set_module.PageSet):
 
   """ Set of pages that are tricky to pinch-zoom """
 
   def __init__(self):
     super(ToughPinchZoomCasesPageSet, self).__init__(
       user_agent_type='desktop',
       archive_data_file='data/tough_pinch_zoom_cases.json',
@@ skipping 29 matching lines @@
 
     self.AddUserStory(YahooGamePage(self))
 
     # Why: #1 Alexa recreation
     self.AddUserStory(ToughPinchZoomCasesPage('http://booking.com', self))
 
     self.AddUserStory(YahooAnswersPage(self))
 
     # Why: #1 Alexa sports
     self.AddUserStory(ToughPinchZoomCasesPage('http://sports.yahoo.com/', self))