Refactor the BluetoothDispatcherHost to store requestDevice sessions

content/browser/bluetooth/bluetooth_dispatcher_host.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 CONTENT_BROWSER_BLUETOOTH_BLUETOOTH_DISPATCHER_HOST_H_
 #define CONTENT_BROWSER_BLUETOOTH_BLUETOOTH_DISPATCHER_HOST_H_
 
 #include "base/basictypes.h"
 #include "base/memory/weak_ptr.h"
 #include "content/public/browser/browser_message_filter.h"
@@ skipping 33 matching lines @@
   void SetBluetoothAdapterForTesting(
       scoped_refptr<device::BluetoothAdapter> mock_adapter);
 
  protected:
   ~BluetoothDispatcherHost() override;
 
  private:
   friend class base::DeleteHelper<BluetoothDispatcherHost>;
   friend struct BrowserThread::DeleteOnThread<BrowserThread::UI>;
 
-  struct DiscoverySessionOptions;
+  struct RequestDeviceSession;
 
   // Set |adapter_| to a BluetoothAdapter instance and register observers,
   // releasing references to previous |adapter_|.
   void set_adapter(scoped_refptr<device::BluetoothAdapter> adapter);
 
   // IPC Handlers, see definitions in bluetooth_messages.h.
   void OnRequestDevice(
       int thread_id,
       int request_id,
       const std::vector<content::BluetoothScanFilter>& filters,
@@ skipping 13 matching lines @@
                    const std::string& characteristic_instance_id);
   void OnWriteValue(int thread_id,
                     int request_id,
                     const std::string& characteristic_instance_id,
                     const std::vector<uint8_t>& value);
 
   // Callbacks for BluetoothAdapter::StartDiscoverySession.
   void OnDiscoverySessionStarted(
       int thread_id,
       int request_id,
-      scoped_ptr<DiscoverySessionOptions> options,
       scoped_ptr<device::BluetoothDiscoverySession> discovery_session);
   void OnDiscoverySessionStartedError(int thread_id, int request_id);
 
   // Stop in progress discovery session.
   void StopDiscoverySession(
       int thread_id,
       int request_id,
-      scoped_ptr<DiscoverySessionOptions> options,
       scoped_ptr<device::BluetoothDiscoverySession> discovery_session);
 
   // Callbacks for BluetoothDiscoverySession::Stop.
-  void OnDiscoverySessionStopped(int thread_id,
-                                 int request_id,
-                                 scoped_ptr<DiscoverySessionOptions> options);
+  void OnDiscoverySessionStopped(int thread_id, int request_id);
   void OnDiscoverySessionStoppedError(int thread_id, int request_id);
 
   // Callbacks for BluetoothDevice::CreateGattConnection.
   void OnGATTConnectionCreated(
       int thread_id,
       int request_id,
       const std::string& device_instance_id,
       scoped_ptr<device::BluetoothGattConnection> connection);
   void OnCreateGATTConnectionError(
       int thread_id,
@@ skipping 17 matching lines @@
       int thread_id,
       int request_id,
       device::BluetoothGattService::GattErrorCode);
 
   // Callbacks for BluetoothGattCharacteristic::WriteRemoteCharacteristic.
   void OnWriteValueSuccess(int thread_id, int request_id);
   void OnWriteValueFailed(int thread_id,
                           int request_id,
                           device::BluetoothGattService::GattErrorCode);
 
+  // Maps a (thread_id,request_id) to information about its requestDevice call,
+  // including the chooser dialog.
+  // An entry is added to this map in OnRequestDevice, and should be removed
+  // again everywhere a requestDevice() reply is sent.
+  std::map<std::pair<int, int>, RequestDeviceSession> request_device_sessions_;
+
   // Maps to get the object's parent based on it's instanceID
   // Map of service_instance_id to device_instance_id.
   std::map<std::string, std::string> service_to_device_;
   // Map of characteristic_instance_id to service_instance_id.
   std::map<std::string, std::string> characteristic_to_service_;
 
   // Defines how long to scan for and how long to discover services for.
   int current_delay_time_;
 
   // A BluetoothAdapter instance representing an adapter of the system.
   scoped_refptr<device::BluetoothAdapter> adapter_;
 
   // Must be last member, see base/memory/weak_ptr.h documentation
   base::WeakPtrFactory<BluetoothDispatcherHost> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BluetoothDispatcherHost);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_BLUETOOTH_BLUETOOTH_DISPATCHER_HOST_H_