Componentize SigninIdAccountHelper.

chrome/browser/signin/signin_account_id_helper.h

 // Copyright 2013 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_SIGNIN_SIGNIN_ACCOUNT_ID_HELPER_H_
 #define CHROME_BROWSER_SIGNIN_SIGNIN_ACCOUNT_ID_HELPER_H_
 
 #include "chrome/browser/signin/signin_manager.h"
 #include "google_apis/gaia/gaia_oauth_client.h"
 #include "google_apis/gaia/oauth2_token_service.h"
 
 class CookieSettings;
 class GaiaAuthFetcher;
-class Profile;
+class ProfileOAuth2TokenService;
+class SigninClient;
 
 // The helper class for managing the obfuscated GAIA ID of the primary
 // account. It fetches the ID when user first signs into Chrome or when user
 // opens a connected Chrome profile without an obfuscated GAIA ID, and stores
 // the ID in the profile preference.
 class SigninAccountIdHelper : public SigninManagerBase::Observer,
                               public OAuth2TokenService::Observer {
  public:
-  SigninAccountIdHelper(Profile* profile, SigninManagerBase* signin_manager);
+  SigninAccountIdHelper(SigninClient* client,
+                        ProfileOAuth2TokenService* token_service,
+                        SigninManagerBase* signin_manager);
   virtual ~SigninAccountIdHelper();
 
   // SigninManagerBase::Observer:
   virtual void GoogleSignedOut(const std::string& username) OVERRIDE;
 
   // OAuth2TokenService::Observer:
   virtual void OnRefreshTokenAvailable(const std::string& account_id) OVERRIDE;
 
   // Disables network requests for testing to avoid messing up with irrelevant
   // tests.
   static void SetDisableForTest(bool disable_for_test);
 
  private:
   // Invoked when receiving the response for |account_id_fetcher_|.
   void OnPrimaryAccountIdFetched(const std::string& gaia_id);
 
   // Helper class for fetching the obfuscated account ID.
   class GaiaIdFetcher;
   scoped_ptr<GaiaIdFetcher> id_fetcher_;
 
   static bool disable_for_test_;
 
-  Profile* profile_;
+  SigninClient* client_;
+  ProfileOAuth2TokenService* token_service_;
   SigninManagerBase* signin_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(SigninAccountIdHelper);
 };
 
 #endif  // CHROME_BROWSER_SIGNIN_SIGNIN_ACCOUNT_ID_HELPER_H_