content/shell/common/webkit_test_helpers.cc - Issue 803813003: Make callers of CommandLine use it via the base:: namespace.

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: content/shell/common/webkit_test_helpers.cc

Issue 803813003: Make callers of CommandLine use it via the base:: namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years 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 | « content/shell/common/shell_content_client.cc ('k') | content/shell/renderer/layout_test/layout_test_render_process_observer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/shell/common/webkit_test_helpers.cc

diff --git a/content/shell/common/webkit_test_helpers.cc b/content/shell/common/webkit_test_helpers.cc

index fbed2cd8ba50c621e27b75a092b763439b6cab07..8d254aaa51a260462c3ba5c7e6016dae304d06c3 100644

--- a/content/shell/common/webkit_test_helpers.cc

+++ b/content/shell/common/webkit_test_helpers.cc

@@ -55,7 +55,8 @@ void ExportLayoutTestSpecificPreferences(const TestPreferences& from,

// of the defaults are controlled via command line flags which are

// automatically set for layout tests.

void ApplyLayoutTestDefaultPreferences(WebPreferences* prefs) {

- const CommandLine& command_line = *CommandLine::ForCurrentProcess();

+ const base::CommandLine& command_line =

+ *base::CommandLine::ForCurrentProcess();

prefs->allow_universal_access_from_file_urls = true;

prefs->dom_paste_enabled = true;

prefs->javascript_can_access_clipboard = true;

@@ -111,7 +112,8 @@ base::FilePath GetWebKitRootDirFilePath() {

std::vector<std::string> GetSideloadFontFiles() {

std::vector<std::string> files;

- const CommandLine& command_line = *CommandLine::ForCurrentProcess();

+ const base::CommandLine& command_line =

+ *base::CommandLine::ForCurrentProcess();

if (command_line.HasSwitch(switches::kRegisterFontFiles)) {

base::SplitString(

command_line.GetSwitchValueASCII(switches::kRegisterFontFiles),