Support multiple URLs for latency testing

chrome/test/vr/perf/latency/android_webvr_latency_test.py

 # Copyright 2017 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.
 
 import webvr_latency_test
 
 import logging
 import os
 import time
 
 
 DEFAULT_SCREEN_WIDTH = 720
 DEFAULT_SCREEN_HEIGHT = 1280
 NUM_VR_ENTRY_ATTEMPTS = 5
 
 
 class AndroidWebVrLatencyTest(webvr_latency_test.WebVrLatencyTest):
   """Android implementation of the WebVR latency test."""
   def __init__(self, args):
     super(AndroidWebVrLatencyTest, self).__init__(args)
     self._device_name = self._Adb(['shell', 'getprop',
                                   'ro.product.name']).strip()
 
-  def _Setup(self):
+  def _OneTimeSetup(self):
     self._Adb(['root'])
 
     # Install the latest VrCore and Chrome APKs
     self._Adb(['install', '-r', '-d',
                '../../third_party/gvr-android-sdk/test-apks/vr_services'
                '/vr_services_current.apk'])
     self._SaveInstalledVrCoreVersion()
     # TODO(bsheedy): Make APK path configurable so usable with other channels
     self._Adb(['install', '-r', 'apks/ChromePublic.apk'])
 
     # Force WebVR support, remove open tabs, and don't have first run
     # experience.
     self._SetChromeCommandLineFlags(['--enable-webvr', '--no-restore-state',
                                      '--disable-fre'])
     # Wake up the device and sleep, otherwise WebGL can crash on startup.
     self._Adb(['shell', 'input', 'keyevent', 'KEYCODE_WAKEUP'])
     time.sleep(1)
 
+
+  def _Setup(self, url):
     # Start Chrome
     self._Adb(['shell', 'am', 'start',
                '-a', 'android.intent.action.MAIN',
                '-n', 'org.chromium.chrome/com.google.android.apps.chrome.Main',
-               self._flicker_app_url])
+               url])
     time.sleep(10)
 
     # Tap the center of the screen to start presenting.
     # It's technically possible that the screen tap won't enter VR on the first
     # time, so try several times by checking for the logcat output from
     # entering VR
     (width, height) = self._GetScreenResolution()
     entered_vr = False
     for _ in xrange(NUM_VR_ENTRY_ATTEMPTS):
       self._Adb(['logcat', '-c'])
       self._Adb(['shell', 'input', 'touchscreen', 'tap', str(width/2),
                  str(height/2)])
       time.sleep(5)
       output = self._Adb(['logcat', '-d'])
       if 'Initialized GVR version' in output:
         entered_vr = True
         break
       logging.warning('Failed to enter VR, retrying')
     if not entered_vr:
       raise RuntimeError('Failed to enter VR after %d attempts'
                          % NUM_VR_ENTRY_ATTEMPTS)
 
   def _Teardown(self):
     # Exit VR and close Chrome
     self._Adb(['shell', 'input', 'keyevent', 'KEYCODE_BACK'])
     self._Adb(['shell', 'am', 'force-stop', 'org.chromium.chrome'])
+
+  def _OneTimeTeardown(self):
+    # Perform teardown again in case an exception was thrown
+    self._Teardown()
     # Turn off the screen
     self._Adb(['shell', 'input', 'keyevent', 'KEYCODE_POWER'])
 
   def _Adb(self, cmd):
     """Runs the given command via adb.
 
     Returns:
       A string containing the stdout and stderr of the adb command.
     """
     # TODO(bsheedy): Maybe migrate to use Devil (overkill?)
@@ skipping 42 matching lines @@
         break
     if not width:
       logging.warning('Could not get actual screen width, defaulting to %d',
                       DEFAULT_SCREEN_WIDTH)
       width = DEFAULT_SCREEN_WIDTH
     if not height:
       logging.warning('Could not get actual screen height, defaulting to %d',
                       DEFAULT_SCREEN_HEIGHT)
       height = DEFAULT_SCREEN_HEIGHT
     return (width, height)