bluetooth: Move mock creation out of BluetoothDispatcherHost to LayoutTestBluetoothAdapterProvider.

content/browser/bluetooth/bluetooth_dispatcher_host.h

Index: content/browser/bluetooth/bluetooth_dispatcher_host.h
diff --git a/content/browser/bluetooth/bluetooth_dispatcher_host.h b/content/browser/bluetooth/bluetooth_dispatcher_host.h
index 86aca14341d1273fa2e4d0367c29a8753850306d..e1ab351b636c8ce3c58e8d44ac6374ca15208999 100644
--- a/content/browser/bluetooth/bluetooth_dispatcher_host.h
+++ b/content/browser/bluetooth/bluetooth_dispatcher_host.h
@@ -34,7 +34,8 @@ class CONTENT_EXPORT BluetoothDispatcherHost final
                                 BrowserThread::ID* thread) override;
   bool OnMessageReceived(const IPC::Message& message) override;
 
-  void SetBluetoothAdapterForTesting(const std::string& name);
+  void SetBluetoothAdapterForTesting(

[scheib, 2015/05/16 02:39:14]

Make this match the signature https://codereview.chromium.org/1125133005/

[scheib, 2015/05/18 16:43:45]

Sorry, my miss-reading here. Fine to have this signature.

+      scoped_refptr<device::BluetoothAdapter> mock_adapter);
 
  protected:
   ~BluetoothDispatcherHost() override;
@@ -69,13 +70,12 @@ class CONTENT_EXPORT BluetoothDispatcherHost final
   void OnDiscoverySessionStopped(int thread_id, int request_id);
   void OnDiscoverySessionStoppedError(int thread_id, int request_id);
 
+  // Defines how long to scan for.
+  int current_scan_time_;
+
   // A BluetoothAdapter instance representing an adapter of the system.
   scoped_refptr<device::BluetoothAdapter> adapter_;
 
-  enum class MockData { NOT_MOCKING, REJECT, RESOLVE };
-  MockData bluetooth_mock_data_set_;
-  BluetoothError bluetooth_request_device_reject_type_;
-
   // Must be last member, see base/memory/weak_ptr.h documentation
   base::WeakPtrFactory<BluetoothDispatcherHost> weak_ptr_factory_;