Bootstrapping: Send meaningful error code/message from Slave to Master

chrome/browser/chromeos/login/screens/host_pairing_screen.cc

 // Copyright 2014 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 "chrome/browser/chromeos/login/screens/host_pairing_screen.h"
 
 #include "base/command_line.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
 #include "chrome/browser/chromeos/policy/enrollment_status_chromeos.h"
 #include "components/pairing/host_pairing_controller.h"
+#include "google_apis/gaia/google_service_auth_error.h"
 
 namespace chromeos {
 
+namespace {
+
+// Gets the fine-grained enrollment error code. It's calculated by concatenated

[achuithb, 2017/06/19 22:57:27]

concatenating

[xdai1, 2017/06/19 23:45:10]

Done.

+// |main_error_code| and |sub_error_code| strings together. The reason that
+// string concatenation is preferred to arithmetic addition is the number of the

[achuithb, 2017/06/19 22:57:27]

is that the number of sub error

[xdai1, 2017/06/19 23:45:10]

Done.

+// sub error states is not necessarily a one-digit number and may have arbitrary
+// digits.
+int GetEnrollmentErrorCode(
+    pairing_chromeos::HostPairingController::ErrorCode main_error_code,
+    std::string sub_error_code) {

[achuithb, 2017/06/19 22:57:27]

This should be const std::string&

And we cannot use an int here? I realize sub_error_codes are all different
enums.

[xdai1, 2017/06/19 23:45:10]

Yes, you're right. int is better here. Thanks! 

+  return std::stoi(std::to_string(static_cast<int>(main_error_code)) +
+                   sub_error_code);
+}
+
+}  // namespace
+
 using namespace host_pairing;
 using namespace pairing_chromeos;
 
 HostPairingScreen::HostPairingScreen(
     BaseScreenDelegate* base_screen_delegate,
     Delegate* delegate,
     HostPairingScreenView* view,
     pairing_chromeos::HostPairingController* remora_controller)
     : BaseScreen(base_screen_delegate, OobeScreen::SCREEN_OOBE_HOST_PAIRING),
       delegate_(delegate),
@@ skipping 130 matching lines @@
     delegate_->RebootHostRequested();
 }
 
 void HostPairingScreen::OnViewDestroyed(HostPairingScreenView* view) {
   if (view_ == view)
     view_ = NULL;
 }
 
 void HostPairingScreen::OnAuthError(const GoogleServiceAuthError& error) {
   enrollment_error_string_ = view_->GetErrorStringFromAuthError(error);
+  enrollment_error_code_ =
+      GetEnrollmentErrorCode(HostPairingController::ErrorCode::AUTH_ERROR,
+                             std::to_string(error.state()));
   OnAnyEnrollmentError();
 }
 
 void HostPairingScreen::OnEnrollmentError(policy::EnrollmentStatus status) {
   enrollment_error_string_ = view_->GetErrorStringFromEnrollmentError(status);
+  enrollment_error_code_ =
+      GetEnrollmentErrorCode(HostPairingController::ErrorCode::ENROLL_ERROR,
+                             std::to_string(status.status()));
   OnAnyEnrollmentError();
 }
 
 void HostPairingScreen::OnOtherError(
     EnterpriseEnrollmentHelper::OtherError error) {
   enrollment_error_string_ = view_->GetErrorStringFromOtherError(error);
+  enrollment_error_code_ = GetEnrollmentErrorCode(
+      HostPairingController::ErrorCode::OTHER_ERROR, std::to_string(error));
   OnAnyEnrollmentError();
 }
 
 void HostPairingScreen::OnDeviceEnrolled(const std::string& additional_token) {
   StartupUtils::MarkDeviceRegistered(base::Bind(&base::DoNothing));
   enrollment_helper_->ClearAuth(base::Bind(&HostPairingScreen::OnAuthCleared,
                                            weak_ptr_factory_.GetWeakPtr()));
 
   policy::BrowserPolicyConnectorChromeOS* connector =
       g_browser_process->platform_part()->browser_policy_connector_chromeos();
   const enterprise_management::PolicyData* policy =
       connector->GetDeviceCloudPolicyManager()->core()->store()->policy();
 
   remora_controller_->SetPermanentId(policy->directory_api_id());
   remora_controller_->OnEnrollmentStatusChanged(
       HostPairingController::ENROLLMENT_STATUS_SUCCESS);
 }
 
 void HostPairingScreen::OnDeviceAttributeUploadCompleted(bool success) {}
 
 void HostPairingScreen::OnDeviceAttributeUpdatePermission(bool granted) {}
 
 void HostPairingScreen::OnAuthCleared() {
   enrollment_helper_.reset();
 }
 
 void HostPairingScreen::OnAnyEnrollmentError() {
   enrollment_helper_->ClearAuth(base::Bind(&HostPairingScreen::OnAuthCleared,
                                            weak_ptr_factory_.GetWeakPtr()));
+  remora_controller_->SetErrorCodeAndMessage(enrollment_error_code_,
+                                             enrollment_error_string_);
   remora_controller_->OnEnrollmentStatusChanged(
       HostPairingController::ENROLLMENT_STATUS_FAILURE);
 }
 
 }  // namespace chromeos