bluetooth: Refactor LayoutTestBluetoothAdapterProvider.

content/shell/browser/layout_test/layout_test_bluetooth_adapter_provider.h

 // Copyright 2015 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_SHELL_BROWSER_LAYOUT_TEST_LAYOUT_TEST_BLUETOOTH_ADAPTER_PROVIDER_H_
 #define CONTENT_SHELL_BROWSER_LAYOUT_TEST_LAYOUT_TEST_BLUETOOTH_ADAPTER_PROVIDER_H_
 
 #include "base/callback.h"
 #include "device/bluetooth/bluetooth_adapter_factory.h"
 #include "device/bluetooth/test/mock_bluetooth_adapter.h"
 #include "device/bluetooth/test/mock_bluetooth_device.h"
+#include "device/bluetooth/test/mock_bluetooth_discovery_session.h"
 
 namespace content {
 
 // Implements fake adapters with named mock data set for use in tests as a
 // result of layout tests calling testRunner.setBluetoothMockDataSet.
 class LayoutTestBluetoothAdapterProvider {
  public:
   // Returns a BluetoothAdapter. Its behavior depends on |fake_adapter_name|.
   static scoped_refptr<device::BluetoothAdapter> GetBluetoothAdapter(
       const std::string& fake_adapter_name);
 
  private:
   // Returns "EmptyAdapter" fake BluetoothAdapter with the following
   // characteristics:
   //  - |StartDiscoverySession| invokes |SuccessfulDiscoverySession|.
   //  - |GetDevices| returns an empty list of devices.
   static scoped_refptr<testing::NiceMock<device::MockBluetoothAdapter>>
   GetEmptyAdapter();
 
   // Returns "SingleEmptyDevice" fake BluetoothAdapter with the following
   // characteristics:
   //  - |StartDiscoverySession| invokes |SuccessfulDiscoverySession|.
   //  - |GetDevices| returns a list with an |EmptyDevice|.
   static scoped_refptr<testing::NiceMock<device::MockBluetoothAdapter>>
   GetSingleEmptyDeviceAdapter();
 
-  // Calls |callback| with a DiscoverySession with the following
+  // Returns a fake DiscoverySession with the following
   // characteristics:
-  //  - |Stop| will invoke |SuccessfulDiscoverySessionStop|.
-  static void SuccessfulDiscoverySession(
-      const device::BluetoothAdapter::DiscoverySessionCallback& callback,
-      const device::BluetoothAdapter::ErrorCallback& error_callback);
-
-  // Calls |callback|.
-  static void SuccessfulDiscoverySessionStop(
-      const base::Closure& callback,
-      const base::Closure& error_callback);
+  //  - |Stop(callback, error_callback)| will run callback.
+  static scoped_ptr<testing::NiceMock<device::MockBluetoothDiscoverySession>>
+  GetDiscoverySession();
 
   // Returns an |EmptyDevice| with the following characeteristics:
   //  - |GetAddress| returns "Empty Mock Device instanceID".
   //  - |GetName| returns "Empty Mock Device name".
   //  - |GetBluetoothClass| returns 0x1F00.  "Unspecified Device Class": see
   //    bluetooth.org/en-us/specification/assigned-numbers/baseband
   //  - |GetVendorIDSource| returns |BluetoothDevice::VENDOR_ID_BLUETOOTH|.
   //  - |GetVendorID| returns 0xFFFF.
   //  - |GetProductID| returns 1.
   //  - |GetDeviceID| returns 2.
   //  - |IsPaired| returns true.
   //  - |GetUUIDs| returns a list with two UUIDs: "1800" and "1801".
   static scoped_ptr<testing::NiceMock<device::MockBluetoothDevice>>
   GetEmptyDevice(device::MockBluetoothAdapter* adapter);
 };
 
+// Invokes Run() on the k-th argument of the function with no arguments.
+ACTION_TEMPLATE(RunCallback,

[Jeffrey Yasskin, 2015/05/19 01:09:01]

I'm nervous about defining something with such a generic name here. We have
several functions called RunCallback in the codebase
(https://code.google.com/p/chromium/codesearch/#search/&sq=package:chromium$&q...),
and although none of them are currently in the content:: namespace, it could
collide in the future. 

For now, would it make sense to put this in an anonymous namespace in the .cc
file?

[ortuno, 2015/05/19 01:51:54]

Done.

+                HAS_1_TEMPLATE_PARAMS(int, k),
+                AND_0_VALUE_PARAMS()) {
+  return ::std::tr1::get<k>(args).Run();
+}
+
+// Function for when the value passed to the callback needs to be a scoped_ptr.
+// Invokes Run() on the k-th argument of the function with value wrapped in
+// scoped_ptr<T>
+ACTION_TEMPLATE(RunCallbackScoped,
+                HAS_2_TEMPLATE_PARAMS(int, k, typename, T),
+                AND_1_VALUE_PARAMS(value)) {
+  return ::std::tr1::get<k>(args).Run(scoped_ptr<T>(value));
+}
+
 }  // namespace content
 
 #endif  // CONTENT_SHELL_BROWSER_LAYOUT_TEST_LAYOUT_TEST_BLUETOOTH_ADAPTER_PROVIDER_H_