summaryrefslogtreecommitdiffstats
path: root/components/nacl/common
diff options
context:
space:
mode:
Diffstat (limited to 'components/nacl/common')
-rw-r--r--components/nacl/common/nacl_cmd_line.cc5
-rw-r--r--components/nacl/common/nacl_nonsfi_util.cc2
2 files changed, 4 insertions, 3 deletions
diff --git a/components/nacl/common/nacl_cmd_line.cc b/components/nacl/common/nacl_cmd_line.cc
index 7ecb674..31dedcd 100644
--- a/components/nacl/common/nacl_cmd_line.cc
+++ b/components/nacl/common/nacl_cmd_line.cc
@@ -10,8 +10,9 @@
namespace nacl {
-void CopyNaClCommandLineArguments(CommandLine* cmd_line) {
- const CommandLine& browser_command_line = *CommandLine::ForCurrentProcess();
+void CopyNaClCommandLineArguments(base::CommandLine* cmd_line) {
+ const base::CommandLine& browser_command_line =
+ *base::CommandLine::ForCurrentProcess();
// Propagate the following switches to the NaCl loader command line (along
// with any associated values) if present in the browser command line.
diff --git a/components/nacl/common/nacl_nonsfi_util.cc b/components/nacl/common/nacl_nonsfi_util.cc
index d56cea6..9797fc1 100644
--- a/components/nacl/common/nacl_nonsfi_util.cc
+++ b/components/nacl/common/nacl_nonsfi_util.cc
@@ -14,7 +14,7 @@ bool IsNonSFIModeEnabled() {
#if defined(OS_CHROMEOS) && defined(ARCH_CPU_ARMEL)
return true;
#elif defined(OS_LINUX)
- return CommandLine::ForCurrentProcess()->HasSwitch(
+ return base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kEnableNaClNonSfiMode);
#else
return false;