Make callers of CommandLine use it via the base:: namespace.

components/signin/core/common/profile_management_switches.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/signin/core/common/profile_management_switches.h"
 
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
 #include "build/build_config.h"
 #include "components/signin/core/common/signin_switches.h"
@@ skipping 13 matching lines @@
 };
 
 State GetProcessState() {
   // Disables the new avatar menu if the web-based signin is turned on, because
   // the new avatar menu always uses the inline signin, which may break some
   // SAML users.
   if (switches::IsEnableWebBasedSignin())
     return STATE_OLD_AVATAR_MENU;
 
   // Find the state of both command line args.
-  bool is_new_avatar_menu =
-      CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kEnableNewAvatarMenu);
+  bool is_new_avatar_menu = base::CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kEnableNewAvatarMenu);
   bool is_new_profile_management =
-      CommandLine::ForCurrentProcess()->HasSwitch(
+      base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableNewProfileManagement);
   bool is_consistent_identity =
-      CommandLine::ForCurrentProcess()->HasSwitch(
+      base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableAccountConsistency);
-  bool not_new_avatar_menu =
-      CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kDisableNewAvatarMenu);
+  bool not_new_avatar_menu = base::CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kDisableNewAvatarMenu);
   bool not_new_profile_management =
-      CommandLine::ForCurrentProcess()->HasSwitch(
+      base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kDisableNewProfileManagement);
   bool not_consistent_identity =
-      CommandLine::ForCurrentProcess()->HasSwitch(
+      base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kDisableAccountConsistency);
   int count_args = (is_new_avatar_menu ? 1 : 0) +
       (is_new_profile_management ? 1 : 0) +
       (is_consistent_identity ? 1 : 0) +
       (not_new_avatar_menu ? 1 : 0) +
       (not_new_profile_management ? 1 : 0) +
       (not_consistent_identity ? 1 : 0);
   bool invalid_commandline = count_args > 1;
 
   // At most only one of the command line args should be specified, otherwise
@@ skipping 48 matching lines @@
     } else {
       state = STATE_OLD_AVATAR_MENU;
     }
   }
 
   return state;
 }
 
 bool CheckFlag(std::string command_switch, State min_state) {
   // Individiual flag settings take precedence.
-  if (CommandLine::ForCurrentProcess()->HasSwitch(command_switch))
+  if (base::CommandLine::ForCurrentProcess()->HasSwitch(command_switch))
     return true;
 
   return GetProcessState() >= min_state;
 }
 
 }  // namespace
 
 namespace switches {
 
 bool IsEnableAccountConsistency() {
   return GetProcessState() >= STATE_ACCOUNT_CONSISTENCY;
 }
 
 bool IsEnableWebBasedSignin() {
-  return CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kEnableWebBasedSignin) && !IsEnableWebviewBasedSignin();
+  return base::CommandLine::ForCurrentProcess()->HasSwitch(
+             switches::kEnableWebBasedSignin) &&
+         !IsEnableWebviewBasedSignin();
 }
 
 bool IsEnableWebviewBasedSignin() {
-  return CommandLine::ForCurrentProcess()->HasSwitch(
+  return base::CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kEnableWebviewBasedSignin);
 }
 
 bool IsExtensionsMultiAccount() {
   return CheckFlag(switches::kExtensionsMultiAccount,
                    STATE_NEW_PROFILE_MANAGEMENT);
 }
 
 bool IsFastUserSwitching() {
-  return CommandLine::ForCurrentProcess()->HasSwitch(
+  return base::CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kFastUserSwitching);
 }
 
 bool IsGoogleProfileInfo() {
   return CheckFlag(switches::kGoogleProfileInfo, STATE_NEW_AVATAR_MENU);
 }
 
 bool IsNewAvatarMenu() {
   // NewAvatarMenu is only available on desktop.
 #if defined(OS_ANDROID) || defined(OS_IOS) || defined(OS_CHROMEOS)
@@ skipping 26 matching lines @@
   command_line->AppendSwitch(switches::kEnableNewProfileManagement);
   DCHECK(!command_line->HasSwitch(switches::kDisableNewProfileManagement));
 }
 
 void EnableAccountConsistencyForTesting(base::CommandLine* command_line) {
   command_line->AppendSwitch(switches::kEnableAccountConsistency);
   DCHECK(!command_line->HasSwitch(switches::kDisableAccountConsistency));
 }
 
 }  // namespace switches