From b33617cb4d1eacfec6f06cc8dc42d096e236edd7 Mon Sep 17 00:00:00 2001 From: "kkosztyo.u-szeged" Date: Thu, 4 Dec 2014 01:54:36 -0800 Subject: 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} --- components/nacl/common/nacl_cmd_line.cc | 5 +++-- components/nacl/common/nacl_nonsfi_util.cc | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'components/nacl/common') 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; -- cgit v1.1