Index: tools/telemetry/telemetry/desktop_browser_backend.py |
diff --git a/tools/telemetry/telemetry/desktop_browser_backend.py b/tools/telemetry/telemetry/desktop_browser_backend.py |
index a0e3d457e4eca004084bd74bf6bc681048bc872b..3fd840024f960022f81245e20fa9c0de78d7f761 100644 |
--- a/tools/telemetry/telemetry/desktop_browser_backend.py |
+++ b/tools/telemetry/telemetry/desktop_browser_backend.py |
@@ -2,6 +2,7 @@ |
# Use of this source code is governed by a BSD-style license that can be |
# found in the LICENSE file. |
import os as os |
+import re |
import subprocess as subprocess |
import shutil |
import tempfile |
@@ -26,6 +27,7 @@ class DesktopBrowserBackend(browser_backend.BrowserBackend): |
raise Exception('Cannot create browser, no executable found!') |
self._port = util.GetAvailableLocalPort() |
+ self._chrome_branch_number = self._GetChromeBranchNumber() |
args = [self._executable] |
args.extend(self.GetBrowserStartupArgs()) |
@@ -47,7 +49,10 @@ class DesktopBrowserBackend(browser_backend.BrowserBackend): |
args = super(DesktopBrowserBackend, self).GetBrowserStartupArgs() |
args.append('--remote-debugging-port=%i' % self._port) |
args.append('--window-size=1280,1024') |
- args.append('--enable-benchmarking') |
+ if self._chrome_branch_number >= 1404: |
nduca
2013/02/12 01:28:49
should this be conditional on content shell, since
Danh Nguyen
2013/02/12 15:57:26
Done. Made all chrome switches conditional on not
|
+ args.append('--enable-net-benchmarking') |
+ else: |
+ args.append('--enable-benchmarking') |
if not self.options.dont_override_profile: |
self._tmpdir = tempfile.mkdtemp() |
args.append('--user-data-dir=%s' % self._tmpdir) |
@@ -107,6 +112,12 @@ class DesktopBrowserBackend(browser_backend.BrowserBackend): |
def CreateForwarder(self, *port_pairs): |
return DoNothingForwarder(*port_pairs) |
+ def _GetChromeBranchNumber(self): |
+ version = subprocess.check_output([self._executable, '--version']) |
+ match = re.match('[^\d]+\s+\d+\.\d+\.(\d+)\.\d+.*', version) |
+ assert match |
+ return int(match.group(1)) |
+ |
class DoNothingForwarder(object): |
def __init__(self, *port_pairs): |
self._host_port = port_pairs[0].local_port |