Remove delegates from ArcAuthCodeFetcher and ArcAuthContext.

chrome/browser/chromeos/arc/arc_auth_context.h

Index: chrome/browser/chromeos/arc/arc_auth_context.h
diff --git a/chrome/browser/chromeos/arc/arc_auth_context.h b/chrome/browser/chromeos/arc/arc_auth_context.h
index 1314e1074705f8153431eb3372e54e7ed04f07d7..0c613e2d45d24dd1c402b30edad5a7ba1a61c85c 100644
--- a/chrome/browser/chromeos/arc/arc_auth_context.h
+++ b/chrome/browser/chromeos/arc/arc_auth_context.h
@@ -8,6 +8,7 @@
 #include <memory>
 #include <string>
 
+#include "base/callback.h"
 #include "base/macros.h"
 #include "base/timer/timer.h"
 #include "google_apis/gaia/ubertoken_fetcher.h"
@@ -25,19 +26,23 @@ class URLRequestContextGetter;
 
 namespace arc {
 
-class ArcAuthContextDelegate;
-
 class ArcAuthContext : public UbertokenConsumer,
                        public GaiaAuthConsumer,
                        public OAuth2TokenService::Observer {
  public:
-  ArcAuthContext(ArcAuthContextDelegate* delegate, Profile* profile);
+  explicit ArcAuthContext(Profile* profile);
   ~ArcAuthContext() override;
 
-  void PrepareContext();
+  ProfileOAuth2TokenService* token_service() { return token_service_; }
+  const std::string& account_id() const { return account_id_; }
 
-  // Returns the URL request context information associated with this context.
-  net::URLRequestContextGetter* GetURLRequestContext();
+  // Prepares the context. Calling while an inflight operation exists will
+  // cancel the inflight operation.
+  // On completion, |context| is passed to the callback. On error, |context|
+  // is nullptr.
+  using PrepareCallback =
+      base::Callback<void(net::URLRequestContextGetter* context)>;
+  void Prepare(const PrepareCallback& callback);
 
   // OAuth2TokenService::Observer:
   void OnRefreshTokenAvailable(const std::string& account_id) override;
@@ -51,29 +56,26 @@ class ArcAuthContext : public UbertokenConsumer,
   void OnMergeSessionSuccess(const std::string& data) override;
   void OnMergeSessionFailure(const GoogleServiceAuthError& error) override;
 
-  const std::string& account_id() const { return account_id_; }
-
-  ProfileOAuth2TokenService* token_service() { return token_service_; }
-
  private:
+  void OnRefreshTokenTimeout();
+
   void StartFetchers();
   void ResetFetchers();
-  void OnRefreshTokenTimeout();
 
-  // Unowned pointers.
-  ArcAuthContextDelegate* const delegate_;
+  // Unowned pointer.
   ProfileOAuth2TokenService* token_service_;
-
-  bool context_prepared_ = false;
+  std::string account_id_;
 
   // Owned by content::BrowserContent. Used to isolate cookies for auth server
   // communication and shared with Arc OptIn UI platform app.
   content::StoragePartition* storage_partition_ = nullptr;
 
-  std::string account_id_;
+  PrepareCallback callback_;
+  bool context_prepared_ = false;
+
+  base::OneShotTimer refresh_token_timeout_;
   std::unique_ptr<GaiaAuthFetcher> merger_fetcher_;
   std::unique_ptr<UbertokenFetcher> ubertoken_fetcher_;
-  base::OneShotTimer refresh_token_timeout_;
 
   DISALLOW_COPY_AND_ASSIGN(ArcAuthContext);
 };