bluetooth: Move mock creation out of BluetoothDispatcherHost to LayoutTestBluetoothAdapterProvider.

content/browser/bluetooth/bluetooth_dispatcher_host.cc

 // 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.
 
 #include "content/browser/bluetooth/bluetooth_dispatcher_host.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "content/common/bluetooth/bluetooth_messages.h"
 #include "content/public/browser/browser_context.h"
 #include "device/bluetooth/bluetooth_adapter.h"
 #include "device/bluetooth/bluetooth_adapter_factory.h"
 #include "device/bluetooth/bluetooth_device.h"
 #include "device/bluetooth/bluetooth_discovery_session.h"
 
 using device::BluetoothAdapter;
 using device::BluetoothAdapterFactory;
 
 namespace content {
 
 const uint32 kUnspecifiedDeviceClass =

[scheib, 2015/05/11 20:19:26]

Delete constant here, it is now unused.

     0x1F00;  // bluetooth.org/en-us/specification/assigned-numbers/baseband
 const int kScanTime = 5;  // 5 seconds of scan time
 
 BluetoothDispatcherHost::BluetoothDispatcherHost(
     BrowserContext* browser_context)
     : BrowserMessageFilter(BluetoothMsgStart),
       browser_context_(browser_context),
-      bluetooth_mock_data_set_(MockData::NOT_MOCKING),
-      bluetooth_request_device_reject_type_(BluetoothError::NOT_FOUND),
       weak_ptr_factory_(this) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   browser_context_->GetBluetoothAdapter(base::Bind(
       &BluetoothDispatcherHost::set_adapter, weak_ptr_factory_.GetWeakPtr()));
 }
 
 void BluetoothDispatcherHost::OnDestruct() const {
   // See class comment: UI Thread Note.
   BrowserThread::DeleteOnUIThread::Destruct(this);
 }
@@ skipping 31 matching lines @@
     adapter_->RemoveObserver(this);
   adapter_ = adapter;
   if (adapter_.get())
     adapter_->AddObserver(this);
 }
 
 void BluetoothDispatcherHost::OnRequestDevice(int thread_id, int request_id) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   // TODO(scheib) Extend this very simple mock implementation by using
   // device/bluetooth/test mock adapter and related classes.
-  switch (bluetooth_mock_data_set_) {
-    case MockData::NOT_MOCKING: {
-      // TODO(scheib): Filter devices by services: crbug.com/440594
-      // TODO(scheib): Device selection UI: crbug.com/436280
-      // TODO(scheib): Utilize BluetoothAdapter::Observer::DeviceAdded/Removed.
-      BluetoothAdapter::DeviceList devices;
+  // TODO(scheib): Filter devices by services: crbug.com/440594
+  // TODO(scheib): Device selection UI: crbug.com/436280
+  // TODO(scheib): Utilize BluetoothAdapter::Observer::DeviceAdded/Removed.
+  BluetoothAdapter::DeviceList devices;
 
-      if (adapter_.get()) {
-        adapter_->StartDiscoverySession(
-            base::Bind(&BluetoothDispatcherHost::OnDiscoverySessionStarted,
-                       weak_ptr_factory_.GetWeakPtr(), thread_id, request_id),
-            base::Bind(&BluetoothDispatcherHost::OnDiscoverySessionStartedError,
-                       weak_ptr_factory_.GetWeakPtr(), thread_id, request_id));
-      } else {
-        DLOG(WARNING) << "No BluetoothAdapter. Can't serve requestDevice.";
-        Send(new BluetoothMsg_RequestDeviceError(thread_id, request_id,
-                                                 BluetoothError::NOT_FOUND));
-      }
-      return;
-    }
-    case MockData::REJECT: {
-      Send(new BluetoothMsg_RequestDeviceError(
-          thread_id, request_id, bluetooth_request_device_reject_type_));
-      return;
-    }
-    case MockData::RESOLVE: {
-      std::vector<std::string> uuids;
-      uuids.push_back("00001800-0000-1000-8000-00805f9b34fb");
-      uuids.push_back("00001801-0000-1000-8000-00805f9b34fb");
-      content::BluetoothDevice device_ipc(
-          "Empty Mock Device instanceID",                // instance_id
-          base::UTF8ToUTF16("Empty Mock Device name"),   // name
-          kUnspecifiedDeviceClass,                       // device_class
-          device::BluetoothDevice::VENDOR_ID_BLUETOOTH,  // vendor_id_source
-          0xFFFF,                                        // vendor_id
-          1,                                             // product_id
-          2,                                             // product_version
-          true,                                          // paired
-          uuids);                                        // uuids
-      Send(new BluetoothMsg_RequestDeviceSuccess(thread_id, request_id,
-                                                 device_ipc));
-      return;
-    }
+  if (adapter_.get()) {
+    adapter_->StartDiscoverySession(
+        base::Bind(&BluetoothDispatcherHost::OnDiscoverySessionStarted,
+                   weak_ptr_factory_.GetWeakPtr(), thread_id, request_id),
+        base::Bind(&BluetoothDispatcherHost::OnDiscoverySessionStartedError,
+                   weak_ptr_factory_.GetWeakPtr(), thread_id, request_id));
+  } else {
+    DLOG(WARNING) << "No BluetoothAdapter. Can't serve requestDevice.";
+    Send(new BluetoothMsg_RequestDeviceError(thread_id, request_id,
+                                             BluetoothError::NOT_FOUND));
   }
-  NOTREACHED();
+  return;
 }
 
 void BluetoothDispatcherHost::OnConnectGATT(
     int thread_id,
     int request_id,
     const std::string& device_instance_id) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   // TODO(ortuno): Add actual implementation of connectGATT. This needs to be
   // done after the "allowed devices map" is implemented.
   Send(new BluetoothMsg_ConnectGATTSuccess(thread_id, request_id,
                                            device_instance_id));
 }
 
 void BluetoothDispatcherHost::OnSetBluetoothMockDataSetForTesting(
     const std::string& name) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
-  if (name == "RejectRequestDevice_NotFoundError") {
-    bluetooth_mock_data_set_ = MockData::REJECT;
-    bluetooth_request_device_reject_type_ = BluetoothError::NOT_FOUND;
-  } else if (name == "RejectRequestDevice_SecurityError") {
-    bluetooth_mock_data_set_ = MockData::REJECT;
-    bluetooth_request_device_reject_type_ = BluetoothError::SECURITY;
-  } else if (name == "ResolveRequestDevice_Empty" ||  // TODO(scheib): Remove.
-             name == "Single Empty Device") {
-    bluetooth_mock_data_set_ = MockData::RESOLVE;
-  } else {
-    bluetooth_mock_data_set_ = MockData::NOT_MOCKING;
-  }
+  browser_context_->GetBluetoothAdapterForTesting(

[scheib, 2015/05/11 20:19:26]

Whitespace typo, run git cl format.

[ortuno, 2015/05/12 19:33:19]

Done.

+      base::Bind(&BluetoothDispatcherHost::set_adapter,
+                 weak_ptr_factory_.GetWeakPtr()),
+      name);
 }
 
 void BluetoothDispatcherHost::OnDiscoverySessionStarted(
     int thread_id,
     int request_id,
     scoped_ptr<device::BluetoothDiscoverySession> discovery_session) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   BrowserThread::PostDelayedTask(
       BrowserThread::UI, FROM_HERE,
       base::Bind(&BluetoothDispatcherHost::StopDiscoverySession,
@@ skipping 49 matching lines @@
 
 void BluetoothDispatcherHost::OnDiscoverySessionStoppedError(int thread_id,
                                                              int request_id) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   DLOG(WARNING) << "BluetoothDispatcherHost::OnDiscoverySessionStoppedError";
   Send(new BluetoothMsg_RequestDeviceError(thread_id, request_id,
                                            BluetoothError::NOT_FOUND));
 }
 
 }  // namespace content