| Index: chrome/browser/password_manager/chrome_password_manager_client.cc
 | 
| diff --git a/chrome/browser/password_manager/chrome_password_manager_client.cc b/chrome/browser/password_manager/chrome_password_manager_client.cc
 | 
| index 0bcc7aa6f0fa40ac8abd60c4699db2590117b190..f5604c40af73aab566eaae846565872c5db21f90 100644
 | 
| --- a/chrome/browser/password_manager/chrome_password_manager_client.cc
 | 
| +++ b/chrome/browser/password_manager/chrome_password_manager_client.cc
 | 
| @@ -104,8 +104,8 @@ ChromePasswordManagerClient::~ChromePasswordManagerClient() {
 | 
|  }
 | 
|  
 | 
|  bool ChromePasswordManagerClient::IsAutomaticPasswordSavingEnabled() const {
 | 
| -  return CommandLine::ForCurrentProcess()->HasSwitch(
 | 
| -      password_manager::switches::kEnableAutomaticPasswordSaving) &&
 | 
| +  return base::CommandLine::ForCurrentProcess()->HasSwitch(
 | 
| +             password_manager::switches::kEnableAutomaticPasswordSaving) &&
 | 
|           chrome::VersionInfo::GetChannel() ==
 | 
|               chrome::VersionInfo::CHANNEL_UNKNOWN;
 | 
|  }
 | 
| @@ -505,7 +505,7 @@ bool ChromePasswordManagerClient::IsTheHotNewBubbleUIEnabled() {
 | 
|  #if !defined(USE_AURA) && !defined(OS_MACOSX)
 | 
|    return false;
 | 
|  #endif
 | 
| -  CommandLine* command_line = CommandLine::ForCurrentProcess();
 | 
| +  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
 | 
|    if (command_line->HasSwitch(switches::kDisableSavePasswordBubble))
 | 
|      return false;
 | 
|  
 | 
| @@ -520,7 +520,7 @@ bool ChromePasswordManagerClient::IsTheHotNewBubbleUIEnabled() {
 | 
|  }
 | 
|  
 | 
|  bool ChromePasswordManagerClient::EnabledForSyncSignin() {
 | 
| -  CommandLine* command_line = CommandLine::ForCurrentProcess();
 | 
| +  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
 | 
|    if (command_line->HasSwitch(
 | 
|            password_manager::switches::kDisableManagerForSyncSignin))
 | 
|      return false;
 | 
| @@ -539,7 +539,7 @@ void ChromePasswordManagerClient::SetUpAutofillSyncState() {
 | 
|    std::string group_name =
 | 
|        base::FieldTrialList::FindFullName("AutofillSyncCredential");
 | 
|  
 | 
| -  CommandLine* command_line = CommandLine::ForCurrentProcess();
 | 
| +  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
 | 
|    if (command_line->HasSwitch(
 | 
|            password_manager::switches::kAllowAutofillSyncCredential)) {
 | 
|      autofill_sync_state_ = ALLOW_SYNC_CREDENTIALS;
 | 
| 
 |