Remove delegates from ArcAuthCodeFetcher and ArcAuthContext.

chrome/browser/chromeos/arc/arc_auth_context.cc

 // Copyright 2016 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.
 
 #include "chrome/browser/chromeos/arc/arc_auth_context.h"
 
+#include "base/callback_helpers.h"
 #include "base/strings/stringprintf.h"
-#include "chrome/browser/chromeos/arc/arc_auth_context_delegate.h"
 #include "chrome/browser/chromeos/arc/arc_support_host.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "components/signin/core/browser/profile_oauth2_token_service.h"
 #include "components/signin/core/browser/signin_manager_base.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/storage_partition.h"
 #include "content/public/common/url_constants.h"
 #include "google_apis/gaia/gaia_auth_fetcher.h"
 #include "google_apis/gaia/gaia_constants.h"
 
 namespace arc {
 
 namespace {
 
-constexpr int kRefreshTokenTimeoutSeconds = 10;
+constexpr base::TimeDelta kRefreshTokenTimeout =
+    base::TimeDelta::FromSeconds(10);
 
 }  // namespace
 
-ArcAuthContext::ArcAuthContext(ArcAuthContextDelegate* delegate,
-                               Profile* profile)
-    : delegate_(delegate) {
+ArcAuthContext::ArcAuthContext(Profile* profile) {
   // Reuse storage used in ARC OptIn platform app.
   const std::string site_url = base::StringPrintf(
       "%s://%s/persist?%s", content::kGuestScheme, ArcSupportHost::kHostAppId,
       ArcSupportHost::kStorageId);
   storage_partition_ = content::BrowserContext::GetStoragePartitionForSite(
       profile, GURL(site_url));
   CHECK(storage_partition_);
 
   // Get token service and account ID to fetch auth tokens.
   token_service_ = ProfileOAuth2TokenServiceFactory::GetForProfile(profile);
@@ skipping 15 matching lines @@
 
 void ArcAuthContext::OnRefreshTokensLoaded() {
   token_service_->RemoveObserver(this);
   refresh_token_timeout_.Stop();
   StartFetchers();
 }
 
 void ArcAuthContext::OnRefreshTokenTimeout() {
   VLOG(2) << "Failed to wait for refresh token.";
   token_service_->RemoveObserver(this);
-  delegate_->OnPrepareContextFailed();
+  base::ResetAndReturn(&callback_).Run(nullptr);
 }
 
 void ArcAuthContext::OnMergeSessionSuccess(const std::string& data) {
   context_prepared_ = true;
   ResetFetchers();
-  delegate_->OnContextReady();
+  base::ResetAndReturn(&callback_)
+      .Run(storage_partition_->GetURLRequestContext());
 }
 
 void ArcAuthContext::OnMergeSessionFailure(
     const GoogleServiceAuthError& error) {
   VLOG(2) << "Failed to merge gaia session " << error.ToString() << ".";
   ResetFetchers();
-  delegate_->OnPrepareContextFailed();
+  base::ResetAndReturn(&callback_).Run(nullptr);
 }
 
 void ArcAuthContext::OnUbertokenSuccess(const std::string& token) {
   ResetFetchers();
   merger_fetcher_.reset(
       new GaiaAuthFetcher(this, GaiaConstants::kChromeOSSource,
                           storage_partition_->GetURLRequestContext()));
   merger_fetcher_->StartMergeSession(token, std::string());
+  base::ResetAndReturn(&callback_).Run(nullptr);
 }
 
 void ArcAuthContext::OnUbertokenFailure(const GoogleServiceAuthError& error) {
   VLOG(2) << "Failed to get ubertoken " << error.ToString() << ".";
   ResetFetchers();
-  delegate_->OnPrepareContextFailed();

[Luis Héctor Chávez, 2016/11/15 23:27:37]

Is this intentionally missing? It _seems_ like it was moved to L89. Both look
weird.

[hidehiko, 2016/11/16 01:00:34]

Good catch. unittest should capture this. A following CL will add it.

 }
 
-void ArcAuthContext::PrepareContext() {
+void ArcAuthContext::Prepare(const PrepareCallback& callback) {
   if (context_prepared_) {
-    delegate_->OnContextReady();
+    callback.Run(storage_partition_->GetURLRequestContext());
     return;
   }
 
+  callback_ = callback;
   token_service_->RemoveObserver(this);
   refresh_token_timeout_.Stop();
 
   if (!token_service_->RefreshTokenIsAvailable(account_id_)) {
     token_service_->AddObserver(this);
-    refresh_token_timeout_.Start(
-        FROM_HERE, base::TimeDelta::FromSeconds(kRefreshTokenTimeoutSeconds),
-        this, &ArcAuthContext::OnRefreshTokenTimeout);
+    refresh_token_timeout_.Start(FROM_HERE, kRefreshTokenTimeout, this,
+                                 &ArcAuthContext::OnRefreshTokenTimeout);
     return;
   }
 
   StartFetchers();
 }
 
 void ArcAuthContext::StartFetchers() {
   DCHECK(!refresh_token_timeout_.IsRunning());
   ResetFetchers();
   ubertoken_fetcher_.reset(
       new UbertokenFetcher(token_service_, this, GaiaConstants::kChromeOSSource,
                            storage_partition_->GetURLRequestContext()));
   ubertoken_fetcher_->StartFetchingToken(account_id_);
 }
 
 void ArcAuthContext::ResetFetchers() {
   merger_fetcher_.reset();
   ubertoken_fetcher_.reset();
 }
 
-net::URLRequestContextGetter* ArcAuthContext::GetURLRequestContext() {
-  DCHECK(context_prepared_);
-  return storage_partition_->GetURLRequestContext();
-}
-
 }  // namespace arc