Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / tools / telemetry / telemetry / core / backends / chrome / chrome_browser_backend.py

diff --git a/src/tools/telemetry/telemetry/core/backends/chrome/chrome_browser_backend.py b/src/tools/telemetry/telemetry/core/backends/chrome/chrome_browser_backend.py
index 90d5fd2..50d16f5 100644 (file)
--- a/src/tools/telemetry/telemetry/core/backends/chrome/chrome_browser_backend.py
+++ b/src/tools/telemetry/telemetry/core/backends/chrome/chrome_browser_backend.py
@@ -83,7 +83,6 @@ class ChromeBrowserBackend(browser_backend.BrowserBackend):
   def GetBrowserStartupArgs(self):
     args = []
     args.extend(self.browser_options.extra_browser_args)
-    args.append('--disable-background-networking')
     args.append('--enable-net-benchmarking')
     args.append('--metrics-recording-only')
     args.append('--no-default-browser-check')
@@ -101,6 +100,9 @@ class ChromeBrowserBackend(browser_backend.BrowserBackend):
     if not '--enable-spdy-proxy-auth' in args:
       args.append('--no-proxy-server')
 
+    if self.browser_options.disable_background_networking:
+      args.append('--disable-background-networking')
+
     if self.browser_options.netsim:
       args.append('--ignore-certificate-errors')
     elif self.browser_options.wpr_mode != wpr_modes.WPR_OFF:
@@ -133,7 +135,7 @@ class ChromeBrowserBackend(browser_backend.BrowserBackend):
 
   def HasBrowserFinishedLaunching(self):
     try:
-      self.Request('')
+      self.Request('', timeout=.1)
     except (exceptions.BrowserGoneException,
             exceptions.BrowserConnectionGoneException):
       return False
@@ -158,9 +160,11 @@ class ChromeBrowserBackend(browser_backend.BrowserBackend):
            document.readyState == 'interactive')
       """
       for e in self._extensions_to_load:
-        if not e.extension_id in self.extension_backend:
+        try:
+          extension_objects = self.extension_backend[e.extension_id]
+        except KeyError:
           return False
-        for extension_object in self.extension_backend[e.extension_id]:
+        for extension_object in extension_objects:
           try:
             res = extension_object.EvaluateJavaScript(
                 extension_ready_js % e.extension_id)
@@ -194,7 +198,7 @@ class ChromeBrowserBackend(browser_backend.BrowserBackend):
   def ListInspectableContexts(self):
     return json.loads(self.Request(''))
 
-  def Request(self, path, timeout=5, throw_network_exception=False):
+  def Request(self, path, timeout=30, throw_network_exception=False):
     url = 'http://127.0.0.1:%i/json' % self._port
     if path:
       url += '/' + path