bluetooth: Move testing IPC from BluetoothDispatcher to BlinkTestRunner

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 "device/bluetooth/bluetooth_adapter.h"
 #include "device/bluetooth/bluetooth_adapter_factory.h"
@@ skipping 32 matching lines @@
   // See class comment: UI Thread Note.
   *thread = BrowserThread::UI;
 }
 
 bool BluetoothDispatcherHost::OnMessageReceived(const IPC::Message& message) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(BluetoothDispatcherHost, message)
   IPC_MESSAGE_HANDLER(BluetoothHostMsg_RequestDevice, OnRequestDevice)
   IPC_MESSAGE_HANDLER(BluetoothHostMsg_ConnectGATT, OnConnectGATT)
-  IPC_MESSAGE_HANDLER(BluetoothHostMsg_SetBluetoothMockDataSetForTesting,
-                      OnSetBluetoothMockDataSetForTesting)
   IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 BluetoothDispatcherHost::~BluetoothDispatcherHost() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   // Clear adapter, releasing observer references.
   set_adapter(scoped_refptr<device::BluetoothAdapter>());
 }
@@ skipping 63 matching lines @@
     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(
+void BluetoothDispatcherHost::SetBluetoothAdapterForTesting(

[scheib, 2015/05/16 01:00:34]

Move to match declaration order.

[ortuno, 2015/05/18 17:40:17]

Done.

     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") {
@@ skipping 63 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