Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(756)

Side by Side Diff: telemetry/telemetry/internal/backends/chrome/chrome_browser_backend.py

Issue 2782683003: Increase the websocket timeout in Chrome OS. (Closed)
Patch Set: Set the timeout in ad-hoc manner. Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import logging 5 import logging
6 import pprint 6 import pprint
7 import shlex 7 import shlex
8 import sys 8 import sys
9 9
10 from telemetry.core import exceptions 10 from telemetry.core import exceptions
11 from telemetry.core import util
11 from telemetry import decorators 12 from telemetry import decorators
12 from telemetry.internal.backends import browser_backend 13 from telemetry.internal.backends import browser_backend
13 from telemetry.internal.backends.chrome import extension_backend 14 from telemetry.internal.backends.chrome import extension_backend
14 from telemetry.internal.backends.chrome import system_info_backend 15 from telemetry.internal.backends.chrome import system_info_backend
15 from telemetry.internal.backends.chrome import tab_list_backend 16 from telemetry.internal.backends.chrome import tab_list_backend
16 from telemetry.internal.backends.chrome_inspector import devtools_client_backend 17 from telemetry.internal.backends.chrome_inspector import devtools_client_backend
17 from telemetry.internal.browser import user_agent 18 from telemetry.internal.browser import user_agent
18 from telemetry.internal.browser import web_contents 19 from telemetry.internal.browser import web_contents
19 from telemetry.testing import options_for_unittests 20 from telemetry.testing import options_for_unittests
20 21
(...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after
262 self._devtools_client = None 263 self._devtools_client = None
263 264
264 @property 265 @property
265 def supports_system_info(self): 266 def supports_system_info(self):
266 return self.GetSystemInfo() != None 267 return self.GetSystemInfo() != None
267 268
268 def GetSystemInfo(self): 269 def GetSystemInfo(self):
269 if self._system_info_backend is None: 270 if self._system_info_backend is None:
270 self._system_info_backend = system_info_backend.SystemInfoBackend( 271 self._system_info_backend = system_info_backend.SystemInfoBackend(
271 self._port) 272 self._port)
273 # TODO(crbug.com/706336): Remove this condional branch once crbug.com/704024
274 # is fixed.
275 if util.IsRunningOnCrosDevice():
276 return self._system_info_backend.GetSystemInfo(timeout=30)
272 return self._system_info_backend.GetSystemInfo() 277 return self._system_info_backend.GetSystemInfo()
273 278
274 @property 279 @property
275 def supports_memory_dumping(self): 280 def supports_memory_dumping(self):
276 return True 281 return True
277 282
278 def DumpMemory(self, timeout=web_contents.DEFAULT_WEB_CONTENTS_TIMEOUT): 283 def DumpMemory(self, timeout=web_contents.DEFAULT_WEB_CONTENTS_TIMEOUT):
279 return self.devtools_client.DumpMemory(timeout) 284 return self.devtools_client.DumpMemory(timeout)
280 285
281 @property 286 @property
(...skipping 14 matching lines...) Expand all
296 def supports_cpu_metrics(self): 301 def supports_cpu_metrics(self):
297 return True 302 return True
298 303
299 @property 304 @property
300 def supports_memory_metrics(self): 305 def supports_memory_metrics(self):
301 return True 306 return True
302 307
303 @property 308 @property
304 def supports_power_metrics(self): 309 def supports_power_metrics(self):
305 return True 310 return True
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698