| OLD | NEW |
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 import unittest | 5 import unittest |
| 6 | 6 |
| 7 from profile_chrome import profiler | 7 from profile_chrome import profiler |
| 8 from profile_chrome import util |
| 8 | 9 |
| 9 from devil.android import device_utils | 10 from devil.android import device_utils |
| 10 from devil.android.sdk import intent | |
| 11 | 11 |
| 12 | 12 |
| 13 class BaseAgentTest(unittest.TestCase): | 13 class BaseAgentTest(unittest.TestCase): |
| 14 def setUp(self): | 14 def setUp(self): |
| 15 devices = device_utils.DeviceUtils.HealthyDevices() | 15 devices = device_utils.DeviceUtils.HealthyDevices() |
| 16 self.browser = 'stable' | 16 self.browser = 'stable' |
| 17 self.package_info = profiler.GetSupportedBrowsers()[self.browser] | 17 self.package_info = profiler.GetSupportedBrowsers()[self.browser] |
| 18 self.device = devices[0] | 18 self.device = devices[0] |
| 19 | 19 |
| 20 self.device.ForceStop(self.package_info.package) | 20 curr_browser = util.GetChromeProcessID(self.device, self.package_info) |
| 21 self.device.StartActivity( | 21 if curr_browser == None: |
| 22 intent.Intent(activity=self.package_info.activity, | 22 util.StartBrowser(self.device, self.package_info) |
| 23 package=self.package_info.package), | |
| 24 blocking=True) | |
| OLD | NEW |