Clean up Assignment Create in BlimpClientContextImpl.

blimp/client/core/session/identity_source.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 "blimp/client/core/session/identity_source.h"
 
+#include <utility>
+
 #include "base/command_line.h"
 #include "base/memory/ptr_util.h"
 #include "blimp/client/core/switches/blimp_client_switches.h"
 
 namespace blimp {
 namespace client {
 
 namespace {
 // OAuth2 token scope.
 const char kOAuth2TokenScope[] =
     "https://www.googleapis.com/auth/userinfo.email";
 
 // Max retry times when OAuth2 token request is canceled.
 const int kTokenRequestCancelMaxRetry = 3;
 }  // namespace
 
-IdentitySource::IdentitySource(BlimpClientContextDelegate* delegate,
-                               const TokenCallback& callback)
+IdentitySource::IdentitySource(
+    std::unique_ptr<IdentityProvider> identity_provider,
+    const base::Callback<void(const GoogleServiceAuthError&)>& error_callback,
+    const TokenCallback& callback)
     : OAuth2TokenService::Consumer("blimp_client"),
+      identity_provider_(std::move(identity_provider)),
+      error_callback_(error_callback),
       token_callback_(callback),
       is_fetching_token_(false),
-      retry_times_(0),
-      delegate_(delegate) {
-  DCHECK(delegate_);
-
-  // Create identity provider.
-  identity_provider_ = delegate_->CreateIdentityProvider();
+      retry_times_(0) {
   DCHECK(identity_provider_.get());
   identity_provider_->AddObserver(this);
 }
 
 IdentitySource::~IdentitySource() {
   identity_provider_->RemoveActiveAccountRefreshTokenObserver(this);
   identity_provider_->RemoveObserver(this);
 }
 
 void IdentitySource::Connect() {
@@ skipping 64 matching lines @@
             << retry_times_;
     FetchAuthToken();
     return;
   }
 
   // If request failure was not caused by cancellation, or reached max retry
   // times on request cancellation, propagate the error to embedder.
   is_fetching_token_ = false;
   retry_times_ = 0;
   VLOG(1) << "OAuth2 token error: " << error.state();
-
-  // Propagate the error.
-  DCHECK(delegate_);
-  delegate_->OnAuthenticationError(error);
+  error_callback_.Run(error);
 }
 
 void IdentitySource::OnRefreshTokenAvailable(const std::string& account_id) {
   if (account_id != account_id_) {
     return;
   }
 
   identity_provider_->RemoveActiveAccountRefreshTokenObserver(this);
   FetchAuthToken();
 }
 
 void IdentitySource::FetchAuthToken() {
   OAuth2TokenService* token_service = identity_provider_->GetTokenService();
   DCHECK(token_service);
 
   if (token_service->RefreshTokenIsAvailable(account_id_)) {
     OAuth2TokenService::ScopeSet scopes;
     scopes.insert(kOAuth2TokenScope);
     token_request_ = token_service->StartRequest(account_id_, scopes, this);
   } else {
     identity_provider_->AddActiveAccountRefreshTokenObserver(this);
   }
 }
 
 }  // namespace client
 }  // namespace blimp