Cleanup: Remove redundant MockGetAuthTokenFunction, add missing cases

chrome/browser/extensions/api/identity/identity_api.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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_API_IDENTITY_IDENTITY_API_H_
 #define CHROME_BROWSER_EXTENSIONS_API_IDENTITY_IDENTITY_API_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 171 matching lines @@
                                      public OAuth2MintTokenFlow::Delegate,
                                      public IdentitySigninFlow::Delegate,
                                      public OAuth2TokenService::Consumer,
                                      public IdentityAPI::ShutdownObserver {
  public:
   DECLARE_EXTENSION_FUNCTION("identity.getAuthToken",
                              EXPERIMENTAL_IDENTITY_GETAUTHTOKEN);
 
   IdentityGetAuthTokenFunction();
 
+  const ExtensionTokenKey* GetExtensionTokenKeyForTest() {
+    return token_key_.get();
+  }
+
  protected:
   virtual ~IdentityGetAuthTokenFunction();
 
   // IdentitySigninFlow::Delegate implementation:
   virtual void SigninSuccess() OVERRIDE;
   virtual void SigninFailed() OVERRIDE;
 
   // GaiaWebAuthFlow::Delegate implementation:
   virtual void OnGaiaFlowFailure(GaiaWebAuthFlow::Failure failure,
                                  GoogleServiceAuthError service_error,
                                  const std::string& oauth_error) OVERRIDE;
   virtual void OnGaiaFlowCompleted(const std::string& access_token,
                                    const std::string& expiration) OVERRIDE;
 
+  // Starts a login access token request.
+  virtual void StartLoginAccessTokenRequest();
+
   // OAuth2TokenService::Consumer implementation:
   virtual void OnGetTokenSuccess(const OAuth2TokenService::Request* request,
                                  const std::string& access_token,
                                  const base::Time& expiration_time) OVERRIDE;
   virtual void OnGetTokenFailure(const OAuth2TokenService::Request* request,
                                  const GoogleServiceAuthError& error) OVERRIDE;
 
   scoped_ptr<OAuth2TokenService::Request> login_token_request_;
 
  private:
   FRIEND_TEST_ALL_PREFIXES(GetAuthTokenFunctionTest,
                            ComponentWithChromeClientId);
   FRIEND_TEST_ALL_PREFIXES(GetAuthTokenFunctionTest,
                            ComponentWithNormalClientId);
   FRIEND_TEST_ALL_PREFIXES(GetAuthTokenFunctionTest, InteractiveQueueShutdown);
   FRIEND_TEST_ALL_PREFIXES(GetAuthTokenFunctionTest, NoninteractiveShutdown);
-  friend class MockGetAuthTokenFunction;
 
   // ExtensionFunction:
   virtual bool RunAsync() OVERRIDE;
 
   // Helpers to report async function results to the caller.
   void StartAsyncRun();
   void CompleteAsyncRun(bool success);
   void CompleteFunctionWithResult(const std::string& access_token);
   void CompleteFunctionWithError(const std::string& error);
 
   // Initiate/complete the sub-flows.
   void StartSigninFlow();
   void StartMintTokenFlow(IdentityMintRequestQueue::MintType type);
   void CompleteMintTokenFlow();
 
   // IdentityMintRequestQueue::Request implementation:
   virtual void StartMintToken(IdentityMintRequestQueue::MintType type) OVERRIDE;
 
   // OAuth2MintTokenFlow::Delegate implementation:
   virtual void OnMintTokenSuccess(const std::string& access_token,
                                   int time_to_live) OVERRIDE;
   virtual void OnMintTokenFailure(
       const GoogleServiceAuthError& error) OVERRIDE;
   virtual void OnIssueAdviceSuccess(
       const IssueAdviceInfo& issue_advice) OVERRIDE;
 
   // IdentityAPI::ShutdownObserver implementation:
   virtual void OnShutdown() OVERRIDE;
 
-  // Starts a login access token request.
-  virtual void StartLoginAccessTokenRequest();
-
 #if defined(OS_CHROMEOS)
   // Starts a login access token request for device robot account. This method
   // will be called only in enterprise kiosk mode in ChromeOS.
   virtual void StartDeviceLoginAccessTokenRequest();
 #endif
 
   // Starts a mint token request to GAIA.
   void StartGaiaRequest(const std::string& login_access_token);
 
   // Methods for invoking UI. Overridable for testing.
   virtual void ShowLoginPopup();
   virtual void ShowOAuthApprovalDialog(const IssueAdviceInfo& issue_advice);
   // Caller owns the returned instance.
   virtual OAuth2MintTokenFlow* CreateMintTokenFlow(
       const std::string& login_access_token);
 
   // Checks if there is a master login token to mint tokens for the extension.
-  virtual bool HasLoginToken() const;
+  bool HasLoginToken() const;
 
   // Maps OAuth2 protocol errors to an error message returned to the
   // developer in chrome.runtime.lastError.
   std::string MapOAuth2ErrorToDescription(const std::string& error);
 
   std::string GetOAuth2ClientId() const;
 
   bool should_prompt_for_scopes_;
   IdentityMintRequestQueue::MintType mint_token_flow_type_;
   scoped_ptr<OAuth2MintTokenFlow> mint_token_flow_;
@@ skipping 61 matching lines @@
   // Helper to initialize final URL prefix.
   void InitFinalRedirectURLPrefix(const std::string& extension_id);
 
   scoped_ptr<WebAuthFlow> auth_flow_;
   GURL final_url_prefix_;
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_API_IDENTITY_IDENTITY_API_H_