Fixed browser crash when using Debug build:

tools/telemetry/telemetry/desktop_browser_backend.py

 # Copyright (c) 2012 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 os as os
+import re
 import subprocess as subprocess
 import shutil
 import tempfile
 
 from telemetry import browser_backend
 from telemetry import util
 
 class DesktopBrowserBackend(browser_backend.BrowserBackend):
   """The backend for controlling a locally-executed browser instance, on Linux,
   Mac or Windows.
   """
   def __init__(self, options, executable, is_content_shell):
     super(DesktopBrowserBackend, self).__init__(is_content_shell, options)
 
     # Initialize fields so that an explosion during init doesn't break in Close.
     self._proc = None
     self._tmpdir = None
     self._tmp_output_file = None
 
     self._executable = executable
     if not self._executable:
       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())
     if not options.show_stdout:
       self._tmp_output_file = tempfile.NamedTemporaryFile('w', 0)
       self._proc = subprocess.Popen(
           args, stdout=self._tmp_output_file, stderr=subprocess.STDOUT)
     else:
       self._proc = subprocess.Popen(args)
 
     try:
       self._WaitForBrowserToComeUp()
       self._PostBrowserStartupInitialization()
     except:
       self.Close()
       raise
 
   def GetBrowserStartupArgs(self):
     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 this is a browser-only
extension?

[Danh Nguyen, 2013/02/12 15:57:26]

Done.  Made all chrome switches conditional on not being content shell.

+      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)
     return args
 
   def IsBrowserRunning(self):
     return self._proc.poll() == None
 
   def GetStandardOutput(self):
     assert self._tmp_output_file, "Can't get standard output with show_stdout"
@@ skipping 39 matching lines @@
       shutil.rmtree(self._tmpdir, ignore_errors=True)
       self._tmpdir = None
 
     if self._tmp_output_file:
       self._tmp_output_file.close()
       self._tmp_output_file = None
 
   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
 
   @property
   def url(self):
     assert self._host_port
     return 'http://localhost:%i' % self._host_port
 
   def Close(self):
     self._host_port = None