tools/telemetry/telemetry/core/backends/chrome/cros_browser_backend.py - Issue 23749004: Move more options to browser options.

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

Unified Diff: tools/telemetry/telemetry/core/backends/chrome/cros_browser_backend.py

Issue 23749004: Move more options to browser options. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fixups Created 7 years, 3 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « tools/telemetry/telemetry/core/backends/chrome/chrome_browser_backend.py ('k') | tools/telemetry/telemetry/core/backends/chrome/desktop_browser_backend.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: tools/telemetry/telemetry/core/backends/chrome/cros_browser_backend.py

diff --git a/tools/telemetry/telemetry/core/backends/chrome/cros_browser_backend.py b/tools/telemetry/telemetry/core/backends/chrome/cros_browser_backend.py

index 81e3c4c8eecdc751a6f14adef2bc2a8e0583f9b6..b1ff96f76b20dff7e3ae2cd5587e6e093fe544c5 100644

--- a/tools/telemetry/telemetry/core/backends/chrome/cros_browser_backend.py

+++ b/tools/telemetry/telemetry/core/backends/chrome/cros_browser_backend.py

@@ -62,14 +62,14 @@ class CrOSBrowserBackend(chrome_browser_backend.ChromeBrowserBackend):

util.WaitFor(lambda: self.IsBrowserRunning(), 20) # pylint: disable=W0108

# Delete test@test.test's cryptohome vault (user data directory).

- if not finder_options.dont_override_profile:

+ if not self.browser_options.dont_override_profile:

logging.info('Deleting user\'s cryptohome vault (the user data dir)')

self._cri.RunCmdOnDevice(

['cryptohome', '--action=remove', '--force', '--user=test@test.test'])

- if finder_options.profile_dir:

+ if self.browser_options.profile_dir:

profile_dir = '/home/chronos/Default'

cri.RunCmdOnDevice(['rm', '-rf', profile_dir])

- cri.PushFile(finder_options.profile_dir + '/Default', profile_dir)

+ cri.PushFile(self.browser_options.profile_dir + '/Default', profile_dir)

cri.RunCmdOnDevice(['chown', '-R', 'chronos:chronos', profile_dir])

def GetBrowserStartupArgs(self):