diff options
| author | achuith@chromium.org <achuith@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-14 20:10:08 +0000 |
|---|---|---|
| committer | achuith@chromium.org <achuith@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-14 20:10:08 +0000 |
| commit | 78aa60534d3302169d247727efa2d15e9a7ba938 (patch) | |
| tree | aa1c4d6a98f5e0e563081f94ed9f64021b624a99 | |
| parent | 7f72399ddfad835c6dbf9ed981c1d1397626f2ea (diff) | |
| download | chromium_src-78aa60534d3302169d247727efa2d15e9a7ba938.zip chromium_src-78aa60534d3302169d247727efa2d15e9a7ba938.tar.gz chromium_src-78aa60534d3302169d247727efa2d15e9a7ba938.tar.bz2 | |
Bug fixes for cros browser options.
* Handle the case where browser_type is not specified on cros (it should default to system).
* Move the assert so the dtor doesn't explode with uninitialized variables.
BUG=359293
TEST=manual
Review URL: https://codereview.chromium.org/221813009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@263714 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | tools/telemetry/telemetry/core/backends/chrome/chrome_browser_options.py | 6 | ||||
| -rw-r--r-- | tools/telemetry/telemetry/core/backends/chrome/cros_browser_backend.py | 8 |
2 files changed, 5 insertions, 9 deletions
diff --git a/tools/telemetry/telemetry/core/backends/chrome/chrome_browser_options.py b/tools/telemetry/telemetry/core/backends/chrome/chrome_browser_options.py index e8224f7..3c26603 100644 --- a/tools/telemetry/telemetry/core/backends/chrome/chrome_browser_options.py +++ b/tools/telemetry/telemetry/core/backends/chrome/chrome_browser_options.py @@ -9,12 +9,8 @@ from telemetry.core.backends.chrome import cros_interface def CreateChromeBrowserOptions(br_options): browser_type = br_options.browser_type - # Unit tests. - if not browser_type: - return br_options - if (cros_interface.IsRunningOnCrosDevice() or - browser_type.startswith('cros')): + (browser_type and browser_type.startswith('cros'))): return CrosBrowserOptions(br_options) return br_options diff --git a/tools/telemetry/telemetry/core/backends/chrome/cros_browser_backend.py b/tools/telemetry/telemetry/core/backends/chrome/cros_browser_backend.py index a48d1ce..b3b6061 100644 --- a/tools/telemetry/telemetry/core/backends/chrome/cros_browser_backend.py +++ b/tools/telemetry/telemetry/core/backends/chrome/cros_browser_backend.py @@ -28,16 +28,16 @@ class CrOSBrowserBackend(chrome_browser_backend.ChromeBrowserBackend): browser_options=browser_options, output_profile_path=None, extensions_to_load=extensions_to_load) - from telemetry.core.backends.chrome import chrome_browser_options - assert isinstance(browser_options, - chrome_browser_options.CrosBrowserOptions) - # Initialize fields so that an explosion during init doesn't break in Close. self._browser_type = browser_type self._cri = cri self._is_guest = is_guest self._forwarder = None + from telemetry.core.backends.chrome import chrome_browser_options + assert isinstance(browser_options, + chrome_browser_options.CrosBrowserOptions) + self.wpr_port_pairs = forwarders.PortPairs( http=forwarders.PortPair(self.wpr_port_pairs.http.local_port, self._cri.GetRemotePort()), |