[Merge to M50] Reset BluetoothHostPairingController in an earlier stage for normal user login flow.

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 "base/macros.h"
@@ skipping 27 matching lines @@
   using Observer = HostPairingController::Observer;
   using InputDeviceInfo = device::InputServiceLinux::InputDeviceInfo;
 
   explicit BluetoothHostPairingController(
       const scoped_refptr<base::SingleThreadTaskRunner>& file_task_runner);
   ~BluetoothHostPairingController() override;
 
  private:
   void ChangeStage(Stage new_stage);
   void SendHostStatus();
-  void Reset();
 
   void OnGetAdapter(scoped_refptr<device::BluetoothAdapter> adapter);
   void SetName();
   void OnSetName();
   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);
@@ skipping 12 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 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;
   void OnAddNetworkMessage(const pairing_api::AddNetwork& message) override;
@@ skipping 33 matching lines @@
   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_