tools/telemetry/telemetry/core/backends/chrome/desktop_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/desktop_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/cros_browser_backend.py ('k') | tools/telemetry/telemetry/core/browser_options.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 0af0a6ca8fca25c25778a02962f82c0d3eb16326..5d5ab32d67ec0a6fa92da9e53017802827b0c93a 100644

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

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

@@ -56,7 +56,7 @@ class DesktopBrowserBackend(chrome_browser_backend.ChromeBrowserBackend):

self._SetupProfile()

def _SetupProfile(self):

- if not self.finder_options.dont_override_profile:

+ if not self.browser_options.dont_override_profile:

if self._output_profile_path:

# If both |_output_profile_path| and |profile_dir| are specified then

# the calling code will throw an exception, so we don't need to worry

@@ -64,7 +64,7 @@ class DesktopBrowserBackend(chrome_browser_backend.ChromeBrowserBackend):

self._tmp_profile_dir = self._output_profile_path

else:

self._tmp_profile_dir = tempfile.mkdtemp()

- profile_dir = self._profile_dir or self.finder_options.profile_dir

+ profile_dir = self._profile_dir or self.browser_options.profile_dir

if profile_dir:

if self.is_content_shell:

logging.critical('Profiles cannot be used with content shell')

@@ -105,7 +105,7 @@ class DesktopBrowserBackend(chrome_browser_backend.ChromeBrowserBackend):

args.append('--enable-net-benchmarking')

else:

args.append('--enable-benchmarking')

- if not self.finder_options.dont_override_profile:

+ if not self.browser_options.dont_override_profile:

args.append('--user-data-dir=%s' % self._tmp_profile_dir)

return args