Clean up Assignment Create in BlimpClientContextImpl.

blimp/client/core/session/identity_source.h

 // 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.
 
 #ifndef BLIMP_CLIENT_CORE_SESSION_IDENTITY_SOURCE_H_
 #define BLIMP_CLIENT_CORE_SESSION_IDENTITY_SOURCE_H_
 
 #include <memory>
 #include <string>
 
 #include "base/callback.h"
 #include "base/macros.h"
 #include "blimp/client/public/blimp_client_context_delegate.h"
 #include "google_apis/gaia/identity_provider.h"
 #include "google_apis/gaia/oauth2_token_service.h"
 
 namespace blimp {
 namespace client {
 
 // IdentitySource handles OAuth2 token request and forward user sign in state
 // change to Blimp with ProfileIdentityProvider.
 class IdentitySource : public OAuth2TokenService::Consumer,
                        public OAuth2TokenService::Observer,
                        public IdentityProvider::Observer {
  public:
-  typedef base::Callback<void(const std::string&)> TokenCallback;
+  using TokenCallback = base::Callback<void(const std::string&)>;
+  using TokenErrorCallback =
+      base::Callback<void(const GoogleServiceAuthError&)>;
 
-  explicit IdentitySource(BlimpClientContextDelegate* delegate,
+  explicit IdentitySource(std::unique_ptr<IdentityProvider> identity_provider,
+                          TokenErrorCallback error_callback,

[David Trainor- moved to gerrit, 2016/10/25 03:14:27]

const &?

[CJ, 2016/10/25 20:38:01]

Done.

                           const TokenCallback& callback);
   ~IdentitySource() override;
 
   // Start Blimp authentication by requesting OAuth2 token from Google.
   // Duplicate connect calls during token fetching will be ignored.
   void Connect();
 
   // Add sign in state observer.
   void AddObserver(IdentityProvider::Observer* observer);
 
@@ skipping 17 matching lines @@
 
  private:
   // Fetch OAuth token.
   void FetchAuthToken();
 
   // OAuth2 token request. The request is created when we start to fetch the
   // access token in OAuth2TokenService::StartRequest, and destroyed when
   // OAuth2TokenService::Consumer callback get called.
   std::unique_ptr<OAuth2TokenService::Request> token_request_;
 
+  TokenErrorCallback error_callback_;
+
   // Callback after OAuth2 token is fetched.
   TokenCallback token_callback_;
 
   // If we are fetching OAuth2 token. Connect call during token fetching will
   // be ignored.
   bool is_fetching_token_;
 
   // Account id of current active user, used during token request.
   std::string account_id_;
 
   // Current retry count due to request cancellation.
   int retry_times_;
 
-  BlimpClientContextDelegate* delegate_;
-
   DISALLOW_COPY_AND_ASSIGN(IdentitySource);
 };
 
 }  // namespace client
 }  // namespace blimp
 
 #endif  // BLIMP_CLIENT_CORE_SESSION_IDENTITY_SOURCE_H_