diff options
| author | avi <avi@chromium.org> | 2014-12-22 16:08:49 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-12-23 00:09:30 +0000 |
| commit | 83883c858834a2524223991537cc90e4be8f0468 (patch) | |
| tree | 3d410fe9b15658023cfed4e3edc9b35ec6683fea /content/zygote | |
| parent | 60c25aebaf6c3bbc90c9c82f83a752ca58c7ddce (diff) | |
| download | chromium_src-83883c858834a2524223991537cc90e4be8f0468.zip chromium_src-83883c858834a2524223991537cc90e4be8f0468.tar.gz chromium_src-83883c858834a2524223991537cc90e4be8f0468.tar.bz2 | |
Make callers of CommandLine use it via the base:: namespace.
Covers content/.
BUG=422426
TEST=none
TBR=ben@chromium.org
Review URL: https://codereview.chromium.org/803813003
Cr-Commit-Position: refs/heads/master@{#309496}
Diffstat (limited to 'content/zygote')
| -rw-r--r-- | content/zygote/zygote_linux.cc | 6 | ||||
| -rw-r--r-- | content/zygote/zygote_main_linux.cc | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/content/zygote/zygote_linux.cc b/content/zygote/zygote_linux.cc index 8e66788..e9b940e 100644 --- a/content/zygote/zygote_linux.cc +++ b/content/zygote/zygote_linux.cc @@ -533,9 +533,9 @@ base::ProcessId Zygote::ReadArgsAndFork(PickleIterator iter, base::GlobalDescriptors::GetInstance()->Reset(mapping); // Reset the process-wide command line to our new command line. - CommandLine::Reset(); - CommandLine::Init(0, NULL); - CommandLine::ForCurrentProcess()->InitFromArgv(args); + base::CommandLine::Reset(); + base::CommandLine::Init(0, NULL); + base::CommandLine::ForCurrentProcess()->InitFromArgv(args); // Update the process title. The argv was already cached by the call to // SetProcessTitleFromCommandLine in ChromeMain, so we can pass NULL here diff --git a/content/zygote/zygote_main_linux.cc b/content/zygote/zygote_main_linux.cc index 3dc64ec..514891e 100644 --- a/content/zygote/zygote_main_linux.cc +++ b/content/zygote/zygote_main_linux.cc @@ -451,7 +451,8 @@ static bool EnterSuidSandbox(sandbox::SetuidSandboxClient* setuid_sandbox, // Note: a non-dumpable process can't be debugged. To debug sandbox-related // issues, one can specify --allow-sandbox-debugging to let the process be // dumpable. - const CommandLine& command_line = *CommandLine::ForCurrentProcess(); + const base::CommandLine& command_line = + *base::CommandLine::ForCurrentProcess(); if (!command_line.HasSwitch(switches::kAllowSandboxDebugging)) { prctl(PR_SET_DUMPABLE, 0, 0, 0, 0); if (prctl(PR_GET_DUMPABLE, 0, 0, 0, 0)) { |