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

components/pairing/bluetooth_host_pairing_controller.h

 // 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.
 
 #ifndef COMPONENTS_PAIRING_BLUETOOTH_HOST_PAIRING_CONTROLLER_H_
 #define COMPONENTS_PAIRING_BLUETOOTH_HOST_PAIRING_CONTROLLER_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 56 matching lines @@
 
   // These functions should be only used in tests.
   void SetDelegateForTesting(TestDelegate* delegate);
   scoped_refptr<device::BluetoothAdapter> GetAdapterForTesting();
 
  private:
   friend class chromeos::BluetoothHostPairingNoInputTest;
 
   void ChangeStage(Stage new_stage);
   void SendHostStatus();
+  void SendErrorCodeAndMessage();
 
   void OnGetAdapter(scoped_refptr<device::BluetoothAdapter> adapter);
   void SetPowered();
   void OnSetPowered();
   void OnCreateService(scoped_refptr<device::BluetoothSocket> socket);
   void OnSetDiscoverable(bool change_stage);
   void OnAccept(const device::BluetoothDevice* device,
                 scoped_refptr<device::BluetoothSocket> socket);
   void OnSendComplete(int bytes_sent);
   void OnReceiveComplete(int bytes, scoped_refptr<net::IOBuffer> io_buffer);
@@ skipping 15 matching lines @@
   void RemoveObserver(Observer* observer) override;
   Stage GetCurrentStage() override;
   void StartPairing() override;
   std::string GetDeviceName() override;
   std::string GetConfirmationCode() override;
   std::string GetEnrollmentDomain() override;
   void OnNetworkConnectivityChanged(Connectivity connectivity_status) override;
   void OnUpdateStatusChanged(UpdateStatus update_status) override;
   void OnEnrollmentStatusChanged(EnrollmentStatus enrollment_status) override;
   void SetPermanentId(const std::string& permanent_id) override;
+  void SetErrorCodeAndMessage(int error_code,
+                              const std::string& error_message) override;
   void Reset() override;
 
   // ProtoDecoder::Observer:
   void OnHostStatusMessage(const pairing_api::HostStatus& message) override;
   void OnConfigureHostMessage(
       const pairing_api::ConfigureHost& message) override;
   void OnPairDevicesMessage(const pairing_api::PairDevices& message) override;
   void OnCompleteSetupMessage(
       const pairing_api::CompleteSetup& message) override;
   void OnErrorMessage(const pairing_api::Error& message) override;
@@ skipping 19 matching lines @@
   Stage current_stage_;
   std::string confirmation_code_;
   std::string enrollment_domain_;
   Connectivity connectivity_status_;
   UpdateStatus update_status_;
   EnrollmentStatus enrollment_status_;
   std::string permanent_id_;
   std::string controller_device_address_;
   bool was_powered_ = false;
 
+  // The format of the |error_code_| is:
+  // [0, "no error"]
+  // [1*, "network error"]
+  // [2*, "authentication error"], e.g., [21, "Service unavailable"], ...
+  // [3*, "enrollment error"], e.g., [31, "DMserver registration error"], ...
+  // [4*, "other error"]
+  // The |error_code_| and |error_message_| will pass over to the master device
+  // to assist error diagnosis.
+  int error_code_ = 0;
+  std::string error_message_;
+
   scoped_refptr<device::BluetoothAdapter> adapter_;
   scoped_refptr<device::BluetoothSocket> service_socket_;
   scoped_refptr<device::BluetoothSocket> controller_socket_;
   std::unique_ptr<ProtoDecoder> proto_decoder_;
   TestDelegate* delegate_ = nullptr;
 
   scoped_refptr<base::SingleThreadTaskRunner> file_task_runner_;
   base::ThreadChecker thread_checker_;
   base::ObserverList<Observer> observers_;
   base::WeakPtrFactory<BluetoothHostPairingController> ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BluetoothHostPairingController);
 };
 
 }  // namespace pairing_chromeos
 
 #endif  // COMPONENTS_PAIRING_BLUETOOTH_HOST_PAIRING_CONTROLLER_H_