tools/telemetry/telemetry/cros_browser_finder.py - Issue 12294002: Revert 182991

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: tools/telemetry/telemetry/cros_browser_finder.py

Issue 12294002: Revert 182991 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 7 years, 10 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:

OLD	NEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 # Copyright (c) 2012 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 """Finds android browsers that can be controlled by telemetry."""	4 """Finds android browsers that can be controlled by telemetry."""

5	5

6 import logging	6 import logging

7	7

8 from telemetry import browser	8 from telemetry import browser

9 from telemetry import platform	9 from telemetry import platform

10 from telemetry import possible_browser	10 from telemetry import possible_browser

(...skipping 60 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
71 logging.warn('')	71 logging.warn('')

72 logging.warn('P.S. Please, tell your manager how INANE this is.')	72 logging.warn('P.S. Please, tell your manager how INANE this is.')

73 else:	73 else:

74 logging.warn(str(ex))	74 logging.warn(str(ex))

75 return []	75 return []

76	76

77 if not cri.FileExistsOnDevice('/opt/google/chrome/chrome'):	77 if not cri.FileExistsOnDevice('/opt/google/chrome/chrome'):

78 logging.warn('Could not find a chrome on ' % cri.hostname)	78 logging.warn('Could not find a chrome on ' % cri.hostname)

79	79

80 return [PossibleCrOSBrowser('cros-chrome', options, cri)]	80 return [PossibleCrOSBrowser('cros-chrome', options, cri)]

OLD	NEW