telemetry: Added timeout parameter to StartTracing.

tools/telemetry/telemetry/core/chrome/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 urllib2
 import httplib
 import socket
 import json
 import re
 import sys
 
 from telemetry.core import util
 from telemetry.core import exceptions
 from telemetry.core import user_agent
+from telemetry.core import web_contents
 from telemetry.core import wpr_modes
 from telemetry.core import wpr_server
 from telemetry.core.chrome import extension_dict_backend
 from telemetry.core.chrome import tab_list_backend
 from telemetry.core.chrome import tracing_backend
 from telemetry.core.chrome import misc_web_contents_backend
 from telemetry.unittest import options_for_unittests
 
 class ExtensionsNotSupportedException(Exception):
   pass
@@ skipping 169 matching lines @@
     return self._chrome_branch_number
 
   @property
   def supports_tab_control(self):
     return self._chrome_branch_number >= 1303
 
   @property
   def supports_tracing(self):
     return self.is_content_shell or self._chrome_branch_number >= 1385
 
-  def StartTracing(self, custom_categories=None):
+  def StartTracing(self, custom_categories=None,
+                   timeout=web_contents.DEFAULT_WEB_CONTENTS_TIMEOUT):
     """ custom_categories is an optional string containing a list of
     comma separated categories that will be traced instead of the
     default category set.  Example: use
     "webkit,cc,disabled-by-default-cc.debug" to trace only those three
     event categories.
     """
     if self._tracing_backend is None:
       self._tracing_backend = tracing_backend.TracingBackend(self._port)
-    self._tracing_backend.BeginTracing(custom_categories)
+    self._tracing_backend.BeginTracing(custom_categories, timeout)
 
   def StopTracing(self):
     self._tracing_backend.EndTracing()
 
   def GetTraceResultAndReset(self):
     return self._tracing_backend.GetTraceResultAndReset()
 
   def GetProcessName(self, cmd_line):
     """Returns a user-friendly name for the process of the given |cmd_line|."""
     if 'nacl_helper_bootstrap' in cmd_line:
@@ skipping 26 matching lines @@
   def __init__(self, *port_pairs):
     self._host_port = port_pairs[0].local_port
 
   @property
   def url(self):
     assert self._host_port
     return 'http://127.0.0.1:%i' % self._host_port
 
   def Close(self):
     self._host_port = None