Refactor the daemon controller so that the callbacks are called on the caller thread.

remoting/host/setup/host_starter.cc

 // Copyright (c) 2012 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 "remoting/host/setup/host_starter.h"
 
 #include "base/guid.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/values.h"
 #include "google_apis/google_api_keys.h"
 #include "remoting/host/pin_hash.h"
 #include "remoting/host/setup/oauth_helper.h"
 
 namespace {
 const int kMaxGetTokensRetries = 3;
 }  // namespace
 
 namespace remoting {
 
 HostStarter::HostStarter(
     scoped_ptr<gaia::GaiaOAuthClient> oauth_client,
     scoped_ptr<remoting::ServiceClient> service_client,
-    scoped_ptr<remoting::DaemonController> daemon_controller)
+    scoped_refptr<remoting::DaemonController> daemon_controller)
     : oauth_client_(oauth_client.Pass()),
       service_client_(service_client.Pass()),
-      daemon_controller_(daemon_controller.Pass()),
+      daemon_controller_(daemon_controller),
       consent_to_data_collection_(false),
       unregistering_host_(false),
       weak_ptr_factory_(this),
       weak_ptr_(weak_ptr_factory_.GetWeakPtr()) {
   main_task_runner_ = base::ThreadTaskRunnerHandle::Get();
 }
 
 HostStarter::~HostStarter() {
 }
 
 scoped_ptr<HostStarter> HostStarter::Create(
     const std::string& chromoting_hosts_url,
     net::URLRequestContextGetter* url_request_context_getter) {
   scoped_ptr<gaia::GaiaOAuthClient> oauth_client(
       new gaia::GaiaOAuthClient(url_request_context_getter));
   scoped_ptr<remoting::ServiceClient> service_client(
       new remoting::ServiceClient(
           chromoting_hosts_url, url_request_context_getter));
-  scoped_ptr<remoting::DaemonController> daemon_controller(
+  scoped_refptr<remoting::DaemonController> daemon_controller(
       remoting::DaemonController::Create());
   return scoped_ptr<HostStarter>(
       new HostStarter(oauth_client.Pass(), service_client.Pass(),
-                      daemon_controller.Pass()));
+                      daemon_controller));
 }
 
 void HostStarter::StartHost(
     const std::string& host_name,
     const std::string& host_pin,
     bool consent_to_data_collection,
     const std::string& auth_code,
     const std::string& redirect_url,
     CompletionCallback on_done) {
   DCHECK(main_task_runner_->BelongsToCurrentThread());
@@ skipping 165 matching lines @@
     main_task_runner_->PostTask(FROM_HERE, base::Bind(
         &HostStarter::OnHostUnregistered, weak_ptr_));
     return;
   }
   CompletionCallback cb = on_done_;
   on_done_.Reset();
   cb.Run(START_ERROR);
 }
 
 }  // namespace remoting