Clean up Assignment Create in BlimpClientContextImpl.

blimp/client/core/context/blimp_client_context_impl.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/context/blimp_client_context_impl.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 120 matching lines @@
 std::unique_ptr<BlimpContents> BlimpClientContextImpl::CreateBlimpContents(
     gfx::NativeWindow window) {
   std::unique_ptr<BlimpContents> blimp_contents =
       blimp_contents_manager_->CreateBlimpContents(window);
   if (blimp_contents)
     delegate_->AttachBlimpContentsHelpers(blimp_contents.get());
   return blimp_contents;
 }
 
 void BlimpClientContextImpl::Connect() {
-  // Start Blimp authentication flow. The OAuth2 token will be used in
-  // assignment source.
-  GetIdentitySource()->Connect();
+  if (!assignment_fetcher_) {
+    assignment_fetcher_ = base::MakeUnique<AssignmentFetcher>(
+        io_thread_task_runner_, file_thread_task_runner_,
+        delegate_->CreateIdentityProvider(), GetAssignerURL(),
+        base::Bind(&BlimpClientContextImpl::OnAssignmentReceived,
+                   weak_factory_.GetWeakPtr()),
+        base::Bind(&BlimpClientContextDelegate::OnAuthenticationError,
+                   base::Unretained(delegate_)));
+  }
+  assignment_fetcher_->Fetch();
 }
 
 void BlimpClientContextImpl::ConnectWithAssignment(
     const Assignment& assignment) {
   io_thread_task_runner_->PostTask(
       FROM_HERE,
       base::Bind(&ClientNetworkComponents::ConnectWithAssignment,
                  base::Unretained(net_components_.get()), assignment));
 }
 
 std::unordered_map<std::string, std::string>
 BlimpClientContextImpl::CreateFeedbackData() {
   return CreateBlimpFeedbackData(blimp_contents_manager_.get());
 }
 
-void BlimpClientContextImpl::OnAuthTokenReceived(
-    const std::string& client_auth_token) {
-  if (!assignment_source_) {
-    assignment_source_.reset(new AssignmentSource(
-        GetAssignerURL(), io_thread_task_runner_, file_thread_task_runner_));
-  }
+IdentitySource* BlimpClientContextImpl::GetIdentitySource() {
+  return assignment_fetcher_->GetIdentitySource();
+}
 
-  VLOG(1) << "Trying to get assignment.";
-  assignment_source_->GetAssignment(
-      client_auth_token,
-      base::Bind(&BlimpClientContextImpl::OnAssignmentReceived,
-                 weak_factory_.GetWeakPtr()));
+ConnectionStatus* BlimpClientContextImpl::GetConnectionStatus() {
+  return &connection_status_;
 }
 
 GURL BlimpClientContextImpl::GetAssignerURL() {
   return GURL(kDefaultAssignerUrl);
 }
 
-IdentitySource* BlimpClientContextImpl::GetIdentitySource() {
-  if (!identity_source_) {
-    CreateIdentitySource();
-  }
-  return identity_source_.get();
-}
-
-ConnectionStatus* BlimpClientContextImpl::GetConnectionStatus() {
-  return &connection_status_;
-}
-
 void BlimpClientContextImpl::OnAssignmentReceived(
     AssignmentRequestResult result,
     const Assignment& assignment) {
   VLOG(1) << "Assignment result: " << result;
 
   // Cache engine info.
   connection_status_.OnAssignmentResult(result, assignment);
 
   // Inform the embedder of the assignment result.
   if (delegate_) {
@@ skipping 41 matching lines @@
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kDownloadWholeDocument))
     settings_feature_->SetRecordWholeDocument(true);
 }
 
 void BlimpClientContextImpl::DropConnection() {
   io_thread_task_runner_->PostTask(
       FROM_HERE, base::Bind(&DropConnectionOnIOThread, net_components_.get()));
 }
 
-void BlimpClientContextImpl::CreateIdentitySource() {
-  identity_source_ = base::MakeUnique<IdentitySource>(
-      delegate_, base::Bind(&BlimpClientContextImpl::OnAuthTokenReceived,
-                            base::Unretained(this)));
-}
-
 void BlimpClientContextImpl::OnImageDecodeError() {
   // Currently we just drop the connection on image decoding error.
   DropConnection();
 }
 
 void BlimpClientContextImpl::OnConnected() {
   if (delegate_) {
     delegate_->OnConnected();
   }
 }
 
 void BlimpClientContextImpl::OnDisconnected(int result) {
   if (delegate_) {
     if (result >= 0) {
       delegate_->OnEngineDisconnected(result);
     } else {
       delegate_->OnNetworkDisconnected(result);
     }
   }
 }
 
 }  // namespace client
 }  // namespace blimp