Pass error messages from native messaging to web-app.

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/bind.h"
 #include "base/callback_helpers.h"
 #include "base/guid.h"
 #include "base/location.h"
@@ skipping 153 matching lines @@
     config->SetString("host_owner", host_owner_);
   }
   config->SetString("xmpp_login", xmpp_login_);
   config->SetString("oauth_refresh_token", refresh_token_);
   config->SetString("host_id", host_id_);
   config->SetString("host_name", host_name_);
   config->SetString("private_key", key_pair_->ToString());
   config->SetString("host_secret_hash", host_secret_hash);
   daemon_controller_->SetConfigAndStart(
       config.Pass(), consent_to_data_collection_,
-      base::Bind(&HostStarter::OnHostStarted, base::Unretained(this)));
+      base::Bind(&HostStarter::OnStartHostSucceeded, base::Unretained(this)),
+      base::Bind(&HostStarter::OnStartHostFailed, base::Unretained(this)));
 }
 
-void HostStarter::OnHostStarted(DaemonController::AsyncResult result) {
+void HostStarter::OnStartHostSucceeded() {
   if (!main_task_runner_->BelongsToCurrentThread()) {
     main_task_runner_->PostTask(FROM_HERE, base::Bind(
-        &HostStarter::OnHostStarted, weak_ptr_, result));
-    return;
-  }
-  if (result != DaemonController::RESULT_OK) {
-    unregistering_host_ = true;
-    service_client_->UnregisterHost(host_id_, access_token_, this);
+        &HostStarter::OnStartHostSucceeded, weak_ptr_));
     return;
   }
   base::ResetAndReturn(&on_done_).Run(START_COMPLETE);
 }
 
+void HostStarter::OnStartHostFailed(const std::string& error_message,
+                                    const tracked_objects::Location& location) {
+  if (!main_task_runner_->BelongsToCurrentThread()) {
+    main_task_runner_->PostTask(FROM_HERE, base::Bind(
+        &HostStarter::OnStartHostFailed, weak_ptr_, error_message, location));
+    return;
+  }
+
+  // start_host is a command-line tool, so the error has already been reported.
+  unregistering_host_ = true;
+  service_client_->UnregisterHost(host_id_, access_token_, this);
+}
+
 void HostStarter::OnOAuthError() {
   if (!main_task_runner_->BelongsToCurrentThread()) {
     main_task_runner_->PostTask(FROM_HERE, base::Bind(
         &HostStarter::OnOAuthError, weak_ptr_));
     return;
   }
   if (unregistering_host_) {
     LOG(ERROR) << "OAuth error occurred when unregistering host.";
   }
 
@@ skipping 18 matching lines @@
 void HostStarter::OnHostUnregistered() {
   if (!main_task_runner_->BelongsToCurrentThread()) {
     main_task_runner_->PostTask(FROM_HERE, base::Bind(
         &HostStarter::OnHostUnregistered, weak_ptr_));
     return;
   }
   base::ResetAndReturn(&on_done_).Run(START_ERROR);
 }
 
 }  // namespace remoting