Changes to the sign in manager in preparation for one-click sign in. This CL

chrome/browser/signin/signin_manager.h

 // 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.
 //
 // The signin manager encapsulates some functionality tracking
 // which user is signed in. When a user is signed in, a ClientLogin
 // request is run on their behalf. Auth tokens are fetched from Google
 // and the results are stored in the TokenService.
 //
 // **NOTE** on semantics of SigninManager:
@@ skipping 64 matching lines @@
   // requests.
   virtual void StartSignIn(const std::string& username,
                            const std::string& password,
                            const std::string& login_token,
                            const std::string& login_captcha);
 
   // Used when a second factor access code was required to complete a signin
   // attempt.
   void ProvideSecondFactorAccessCode(const std::string& access_code);
 
+  // Attempt to sign in this user with existing credentials from the cookie jar.
+  // Otherwise the result is the same as StartSignIn().

[Andrew T Wilson (Slow), 2012/02/27 19:00:10]

Can you clarify this - does this mean we try to login twice (once with cookies,
then once with username/password)? This seems like an odd contract (it's not
clear to me reading this what notifications would get generated in this process,
if the password is guaranteed to be valid if signin is done via cookies, etc).

[Roger Tawa OOO till Jul 10th, 2012/02/29 21:02:54]

No only one login, and this with no user interaction.  This function essentially
uses the cookies already found in the cookie jar to kick off the process of
logging in.  However, the cookies are not enough to get the user's password,
hence it is passed in here.  The username is used to set
possibly_invalid_username_.

+  virtual void StartSignInWithCredentials(const std::string& username,
+                                          const std::string& password);
+
   // Sign a user out, removing the preference, erasing all keys
   // associated with the user, and canceling all auth in progress.
   virtual void SignOut();
 
   // Returns the auth error associated with the last login attempt, or None if
   // there have been no login failures.
   virtual const GoogleServiceAuthError& GetLoginAuthError() const;
 
   // Returns true if there's a signin in progress.
   bool AuthInProgress() const;
 
   // Handles errors if a required user info key is not returned from the
   // GetUserInfo call.
   void OnGetUserInfoKeyNotFound(const std::string& key);
 
   // GaiaAuthConsumer
   virtual void OnClientLoginSuccess(const ClientLoginResult& result) OVERRIDE;
   virtual void OnClientLoginFailure(
       const GoogleServiceAuthError& error) OVERRIDE;
+  virtual void OnOAuthLoginTokenSuccess(const std::string& refresh_token,
+                                        const std::string& access_token,
+                                        int expires_in_secs) OVERRIDE;
+  virtual void OnOAuthLoginTokenFailure(
+      const GoogleServiceAuthError& error) OVERRIDE;
   virtual void OnGetUserInfoSuccess(const UserInfoMap& data) OVERRIDE;
   virtual void OnGetUserInfoFailure(
       const GoogleServiceAuthError& error) OVERRIDE;
+  virtual void OnTokenAuthSuccess(const net::ResponseCookies& cookies,
+                                  const std::string& data) OVERRIDE;
   virtual void OnTokenAuthFailure(const GoogleServiceAuthError& error) OVERRIDE;
+  virtual void OnUberAuthTokenSuccess(const std::string& token) OVERRIDE;
+  virtual void OnUberAuthTokenFailure(
+      const GoogleServiceAuthError& error) OVERRIDE;
 
   // content::NotificationObserver
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
  private:
   friend class FakeSigninManager;
   FRIEND_TEST_ALL_PREFIXES(SigninManagerTest, ClearTransientSigninData);
   FRIEND_TEST_ALL_PREFIXES(SigninManagerTest, ProvideSecondFactorSuccess);
@@ skipping 27 matching lines @@
   // The last error we received when logging in (used to retrieve details like
   // captchas, etc).
   GoogleServiceAuthError last_login_auth_error_;
 
   std::string authenticated_username_;
 
   DISALLOW_COPY_AND_ASSIGN(SigninManager);
 };
 
 #endif  // CHROME_BROWSER_SIGNIN_SIGNIN_MANAGER_H_