Add enterprise enrollment support for fake users.

chrome/browser/chromeos/policy/policy_oauth2_token_fetcher.h

Index: chrome/browser/chromeos/policy/policy_oauth2_token_fetcher.h
diff --git a/chrome/browser/chromeos/policy/policy_oauth2_token_fetcher.h b/chrome/browser/chromeos/policy/policy_oauth2_token_fetcher.h
index a0d020b5b66e41739b05e979f25db534b09c077d..28c667015aa6e596d379deadd226da954a462d1f 100644
--- a/chrome/browser/chromeos/policy/policy_oauth2_token_fetcher.h
+++ b/chrome/browser/chromeos/policy/policy_oauth2_token_fetcher.h
@@ -30,95 +30,45 @@ namespace policy {
 // send a (possibly empty) token to the callback, which will then let the policy
 // subsystem proceed and resume Profile creation. Sending the token even when no
 // Profile is pending is also OK.
-class PolicyOAuth2TokenFetcher
-    : public base::SupportsWeakPtr<PolicyOAuth2TokenFetcher>,
-      public GaiaAuthConsumer,
-      public OAuth2AccessTokenConsumer {
+class PolicyOAuth2TokenFetcher {
  public:
+  static PolicyOAuth2TokenFetcher* CreateInstance();
+
+  // Makes CreateInstance() return a fake token fetcher that does not make
+  // network calls so tests can avoid a dependency on GAIA.
+  static void UseFakeTokensForTesting();
+
   typedef base::Callback<void(const std::string&,

[achuithb, 2016/03/08 08:11:45]

switch this to 'using' since you're here.

[jdufault, 2016/03/08 21:37:09]

Done.

                               const GoogleServiceAuthError&)> TokenCallback;
 
   PolicyOAuth2TokenFetcher();
-  ~PolicyOAuth2TokenFetcher() override;
+  virtual ~PolicyOAuth2TokenFetcher();
 
   // Fetches the device management service's oauth2 token. This may be fetched
   // via signin context, auth code, or oauth2 refresh token.
-  void StartWithSigninContext(
+  virtual void StartWithSigninContext(
       net::URLRequestContextGetter* auth_context_getter,
       net::URLRequestContextGetter* system_context_getter,
-      const TokenCallback& callback);
-  void StartWithAuthCode(const std::string& auth_code,
-                         net::URLRequestContextGetter* system_context_getter,
-                         const TokenCallback& callback);
-  void StartWithRefreshToken(
+      const TokenCallback& callback) = 0;
+  virtual void StartWithAuthCode(
+      const std::string& auth_code,
+      net::URLRequestContextGetter* system_context_getter,
+      const TokenCallback& callback) = 0;
+  virtual void StartWithRefreshToken(
       const std::string& oauth2_refresh_token,
       net::URLRequestContextGetter* system_context_getter,
-      const TokenCallback& callback);
+      const TokenCallback& callback) = 0;
 
   // Returns true if we have previously attempted to fetch tokens with this
   // class and failed.
-  bool failed() const {
-    return failed_;
-  }
-
-  const std::string& oauth2_refresh_token() const {
-    return oauth2_refresh_token_;
-  }
-  const std::string& oauth2_access_token() const {
-    return oauth2_access_token_;
-  }
+  virtual bool failed() const = 0;

[achuithb, 2016/03/08 08:11:45]

Shouldn't this be Failed()? Same for methods below? They are no longer inline

[jdufault, 2016/03/08 21:37:08]

Done.

+  virtual const std::string& oauth2_refresh_token() const = 0;
+  virtual const std::string& oauth2_access_token() const = 0;
 
  private:
-  // GaiaAuthConsumer overrides.
-  void OnClientOAuthSuccess(
-      const GaiaAuthConsumer::ClientOAuthResult& oauth_tokens) override;
-  void OnClientOAuthFailure(const GoogleServiceAuthError& error) override;
-
-  // OAuth2AccessTokenConsumer overrides.
-  void OnGetTokenSuccess(const std::string& access_token,
-                         const base::Time& expiration_time) override;
-  void OnGetTokenFailure(const GoogleServiceAuthError& error) override;
-
-  // Starts fetching OAuth2 refresh token.
-  void StartFetchingRefreshToken();
-
-  // Starts fetching OAuth2 access token for the device management service.
-  void StartFetchingAccessToken();
-
-  // Decides how to proceed on GAIA |error|. If the error looks temporary,
-  // retries |task| until max retry count is reached.
-  // If retry count runs out, or error condition is unrecoverable, it calls
-  // Delegate::OnOAuth2TokenFetchFailed().
-  void RetryOnError(const GoogleServiceAuthError& error,
-                    const base::Closure& task);
-
-  // Passes |token| and |error| to the |callback_|.
-  void ForwardPolicyToken(const std::string& token,
-                          const GoogleServiceAuthError& error);
-
-  // Auth code which is used to retreive a refresh token.
-  std::string auth_code_;
-
-  scoped_refptr<net::URLRequestContextGetter> auth_context_getter_;
-  scoped_refptr<net::URLRequestContextGetter> system_context_getter_;
-  scoped_ptr<GaiaAuthFetcher> refresh_token_fetcher_;
-  scoped_ptr<OAuth2AccessTokenFetcher> access_token_fetcher_;
-
-  // OAuth2 refresh token. Could come either from the outside or through
-  // refresh token fetching flow within this class.
-  std::string oauth2_refresh_token_;
-
-  // OAuth2 access token.
-  std::string oauth2_access_token_;
-
-  // The retry counter. Increment this only when failure happened.
-  int retry_count_ = 0;
-
-  // True if we have already failed to fetch the policy.
-  bool failed_ = false;
-
-  // The callback to invoke when done.
-  TokenCallback callback_;
+  // If true, fake policy tokens will be sent instead of making network
+  // requests.
+  static bool use_fake_tokens_for_testing_;

[achuithb, 2016/03/08 08:11:44]

move this to anonymous namespace in cc?

[jdufault, 2016/03/08 21:37:09]

Done.

 
   DISALLOW_COPY_AND_ASSIGN(PolicyOAuth2TokenFetcher);
 };