summaryrefslogtreecommitdiffstats
path: root/components/nacl/zygote
diff options
context:
space:
mode:
authorkkosztyo.u-szeged <kkosztyo.u-szeged@partner.samsung.com>2014-12-04 01:54:36 -0800
committerCommit bot <commit-bot@chromium.org>2014-12-04 09:55:03 +0000
commitb33617cb4d1eacfec6f06cc8dc42d096e236edd7 (patch)
tree349d8c9140984d379b45e30476805493668ae140 /components/nacl/zygote
parente69fcbd9b7ce482380eb70f987a2020c46f65001 (diff)
downloadchromium_src-b33617cb4d1eacfec6f06cc8dc42d096e236edd7.zip
chromium_src-b33617cb4d1eacfec6f06cc8dc42d096e236edd7.tar.gz
chromium_src-b33617cb4d1eacfec6f06cc8dc42d096e236edd7.tar.bz2
Prefix CommandLine usage with base namespace (Part 9: components)
Prefix all CommandLine usage in the components/ directory's following subdirectories: feedback, gcm_driver, google, infobars, invalidation, keyed_service, metrics, nacl, omnibox and os_crypt with the base:: namespace BUG=422426 Review URL: https://codereview.chromium.org/774933004 Cr-Commit-Position: refs/heads/master@{#306790}
Diffstat (limited to 'components/nacl/zygote')
-rw-r--r--components/nacl/zygote/nacl_fork_delegate_linux.cc9
1 files changed, 5 insertions, 4 deletions
diff --git a/components/nacl/zygote/nacl_fork_delegate_linux.cc b/components/nacl/zygote/nacl_fork_delegate_linux.cc
index 2b13cfb..71cac68 100644
--- a/components/nacl/zygote/nacl_fork_delegate_linux.cc
+++ b/components/nacl/zygote/nacl_fork_delegate_linux.cc
@@ -199,9 +199,9 @@ void NaClForkDelegate::Init(const int sandboxdesc,
} else if (RunningOnValgrind()) {
status_ = kNaClHelperValgrind;
} else {
- CommandLine::StringVector argv_to_launch;
+ base::CommandLine::StringVector argv_to_launch;
{
- CommandLine cmd_line(CommandLine::NO_PROGRAM);
+ base::CommandLine cmd_line(base::CommandLine::NO_PROGRAM);
if (use_nacl_bootstrap)
cmd_line.SetProgram(helper_bootstrap_exe);
else
@@ -214,7 +214,8 @@ void NaClForkDelegate::Init(const int sandboxdesc,
switches::kNaClDangerousNoSandboxNonSfi,
switches::kNoSandbox,
};
- const CommandLine& current_cmd_line = *CommandLine::ForCurrentProcess();
+ const base::CommandLine& current_cmd_line =
+ *base::CommandLine::ForCurrentProcess();
cmd_line.CopySwitchesFrom(current_cmd_line, kForwardSwitches,
arraysize(kForwardSwitches));
@@ -226,7 +227,7 @@ void NaClForkDelegate::Init(const int sandboxdesc,
if (use_nacl_bootstrap) {
// Arguments to the bootstrap helper which need to be at the start
// of the command line, right after the helper's path.
- CommandLine::StringVector bootstrap_prepend;
+ base::CommandLine::StringVector bootstrap_prepend;
bootstrap_prepend.push_back(helper_exe.value());
bootstrap_prepend.push_back(kNaClHelperReservedAtZero);
bootstrap_prepend.push_back(kNaClHelperRDebug);