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 22 matching lines @@
 
 #if defined(OS_ANDROID)
 #include "blimp/client/core/context/android/blimp_client_context_impl_android.h"
 #endif  // OS_ANDROID
 
 namespace blimp {
 namespace client {
 
 namespace {
 
-const char kDefaultAssignerUrl[] =
-    "https://blimp-pa.googleapis.com/v1/assignment";
-
 void DropConnectionOnIOThread(ClientNetworkComponents* net_components) {
   net_components->GetBrowserConnectionHandler()->DropCurrentConnection();
 }
 
 }  // namespace
 
 // This function is declared in //blimp/client/public/blimp_client_context.h,
 // and either this function or the one in
 // //blimp/client/core/dummy_blimp_client_context.cc should be linked in to
 // any binary using BlimpClientContext::Create.
@@ skipping 42 matching lines @@
   net_components_.reset(new ClientNetworkComponents(
       base::MakeUnique<CrossThreadNetworkEventObserver>(
           connection_status_.GetWeakPtr(),
           base::SequencedTaskRunnerHandle::Get())));
 
   // The |thread_pipe_manager_| must be set up correctly before features are
   // registered.
   thread_pipe_manager_ = base::MakeUnique<ThreadPipeManager>(
       io_thread_task_runner_, net_components_->GetBrowserConnectionHandler());
 
+  assignment_fetcher_ = base::MakeUnique<AssignmentFetcher>(
+      base::Bind(&BlimpClientContextImpl::OnAssignmentReceived,
+                 weak_factory_.GetWeakPtr()),
+      io_thread_task_runner_, file_thread_task_runner_);
+
   RegisterFeatures();
   InitializeSettings();
 
   // Initialize must only be posted after the features have been
   // registered.
   io_thread_task_runner_->PostTask(
       FROM_HERE, base::Bind(&ClientNetworkComponents::Initialize,
                             base::Unretained(net_components_.get())));
 
   UMA_HISTOGRAM_BOOLEAN("Blimp.Supported", true);
@@ skipping 10 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();
+  assignment_fetcher_->Fetch(delegate_);
 }
 
 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_));
-  }
-
-  VLOG(1) << "Trying to get assignment.";
-  assignment_source_->GetAssignment(
-      client_auth_token,
-      base::Bind(&BlimpClientContextImpl::OnAssignmentReceived,
-                 weak_factory_.GetWeakPtr()));
-}
-
-GURL BlimpClientContextImpl::GetAssignerURL() {
-  return GURL(kDefaultAssignerUrl);
-}
-
 IdentitySource* BlimpClientContextImpl::GetIdentitySource() {
-  if (!identity_source_) {
-    CreateIdentitySource();
-  }
-  return identity_source_.get();
+  return assignment_fetcher_->GetIdentitySource();

[David Trainor- moved to gerrit, 2016/10/13 03:52:29]

I wonder if we can pass the IdentityProvider directly to the settings object
instead?  We can talk to xingliu@ about it.

[CJ, 2016/10/13 21:19:16]

Yeah I'm pretty out of the loop when it comes to settings. 

[David Trainor- moved to gerrit, 2016/10/20 16:50:32]

Don't worry about this for now, I/we can look into it afterwards.

[CJ, 2016/10/20 20:52:57]

Acknowledged.

 }
 
 ConnectionStatus* BlimpClientContextImpl::GetConnectionStatus() {
   return &connection_status_;
 }
 
 void BlimpClientContextImpl::OnAssignmentReceived(
     AssignmentRequestResult result,
     const Assignment& assignment) {
   VLOG(1) << "Assignment result: " << result;
@@ skipping 47 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();
 }
 
 }  // namespace client
 }  // namespace blimp