suppress user/password dialog when re-enabling sync

chrome/browser/signin/signin_manager.cc

 // Copyright (c) 2012 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 "chrome/browser/signin/signin_manager.h"
 
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 107 matching lines @@
 // Users must always sign out before they sign in again.
 void SigninManager::StartSignIn(const std::string& username,
                                 const std::string& password,
                                 const std::string& login_token,
                                 const std::string& login_captcha) {
   DCHECK(authenticated_username_.empty() ||
          username == authenticated_username_);
   PrepareForSignin();
   possibly_invalid_username_.assign(username);
   password_.assign(password);
+  convenient_password_.assign(password);
 
   client_login_.reset(new GaiaAuthFetcher(this,
                                           GaiaConstants::kChromeSource,
                                           profile_->GetRequestContext()));
   client_login_->StartClientLogin(username,
                                   password,
                                   "",
                                   login_token,
                                   login_captcha,
                                   GaiaAuthFetcher::HostedAccountsNotAllowed);
@@ skipping 28 matching lines @@
                                   GaiaAuthFetcher::HostedAccountsNotAllowed);
 }
 
 void SigninManager::StartSignInWithCredentials(const std::string& session_index,
                                                const std::string& username,
                                                const std::string& password) {
   DCHECK(authenticated_username_.empty());
   PrepareForSignin();
   possibly_invalid_username_.assign(username);
   password_.assign(password);
+  convenient_password_.assign(password);
 
   client_login_.reset(new GaiaAuthFetcher(this,
                                           GaiaConstants::kChromeSource,
                                           profile_->GetRequestContext()));
 
   // This function starts with the current state of the web session's cookie
   // jar and mints a new ClientLogin-style SID/LSID pair.  This involves going
   // throug the follow process or requests to GAIA and LSO:
   //
   // - call /o/oauth2/programmatic_auth with the returned token to get oauth2
@@ skipping 212 matching lines @@
                                               profile_->GetRequestContext()));
     }
 
     client_login_->StartMergeSession(tok_details->token());
 
     // We only want to do this once per sign-in.
     CleanupNotificationRegistration();
   }
 #endif
 }