Fix update and enrollment flow

components/pairing/bluetooth_controller_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 CHROMEOS_PAIRING_BLUETOOTH_CONTROLLER_PAIRING_FLOW_H_
 #define CHROMEOS_PAIRING_BLUETOOTH_CONTROLLER_PAIRING_FLOW_H_
 
 #include <set>
 
 #include "base/macros.h"
@@ skipping 21 matching lines @@
   BluetoothControllerPairingController();
   virtual ~BluetoothControllerPairingController();
 
  private:
   void ChangeStage(Stage new_stage);
   device::BluetoothDevice* GetController();
   void Reset();
   void DeviceFound(device::BluetoothDevice* device);
   void DeviceLost(device::BluetoothDevice* device);
   void SendBuffer(scoped_refptr<net::IOBuffer> io_buffer, int size);
+  void CompleteSetup();
 
   void OnSetPowered();
   void OnGetAdapter(scoped_refptr<device::BluetoothAdapter> adapter);
   void OnStartDiscoverySession(
       scoped_ptr<device::BluetoothDiscoverySession> discovery_session);
   void OnConnect();
   void OnConnectToService(scoped_refptr<device::BluetoothSocket> socket);
   void OnSendComplete(int bytes_sent);
   void OnReceiveComplete(int bytes, scoped_refptr<net::IOBuffer> io_buffer);
 
@@ skipping 49 matching lines @@
                               const std::string& pincode) override;
   virtual void DisplayPasskey(device::BluetoothDevice* device,
                               uint32 passkey) override;
   virtual void KeysEntered(device::BluetoothDevice* device,
                            uint32 entered) override;
   virtual void ConfirmPasskey(device::BluetoothDevice* device,
                               uint32 passkey) override;
   virtual void AuthorizePairing(device::BluetoothDevice* device) override;
 
   Stage current_stage_;
-  bool got_initial_status_;
   scoped_refptr<device::BluetoothAdapter> adapter_;
   scoped_ptr<device::BluetoothDiscoverySession> discovery_session_;
   scoped_refptr<device::BluetoothSocket> socket_;
   std::string controller_device_id_;
 
   std::string confirmation_code_;
   std::set<std::string> discovered_devices_;
 
   scoped_ptr<ProtoDecoder> proto_decoder_;
 
   base::ThreadChecker thread_checker_;
   ObserverList<ControllerPairingController::Observer> observers_;
   base::WeakPtrFactory<BluetoothControllerPairingController> ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BluetoothControllerPairingController);
 };
 
 }  // namespace pairing_chromeos
 
 #endif  // CHROMEOS_PAIRING_BLUETOOTH_CONTROLLER_PAIRING_FLOW_H_