Expose SetDiscoveryFilter from BluetoothEventRouter

device/bluetooth/test/mock_bluetooth_adapter.h

Index: device/bluetooth/test/mock_bluetooth_adapter.h
diff --git a/device/bluetooth/test/mock_bluetooth_adapter.h b/device/bluetooth/test/mock_bluetooth_adapter.h
index d338256255704ee09ca1f706802b6782b0bd3778..19f0c3705fe06b99e50a17bfb451dcc31c9c33f1 100644
--- a/device/bluetooth/test/mock_bluetooth_adapter.h
+++ b/device/bluetooth/test/mock_bluetooth_adapter.h
@@ -61,6 +61,10 @@ class MockBluetoothAdapter : public BluetoothAdapter {
   MOCK_METHOD2(StartDiscoverySession,
                void(const DiscoverySessionCallback& callback,
                     const ErrorCallback& error_callback));
+  MOCK_METHOD3(StartDiscoverySessionWithFilterRaw,
+               void(const BluetoothDiscoveryFilter*,
+                    const DiscoverySessionCallback& callback,
+                    const ErrorCallback& error_callback));
   MOCK_CONST_METHOD0(GetDevices, BluetoothAdapter::ConstDeviceList());
   MOCK_METHOD1(GetDevice, BluetoothDevice*(const std::string& address));
   MOCK_CONST_METHOD1(GetDevice,
@@ -86,6 +90,11 @@ class MockBluetoothAdapter : public BluetoothAdapter {
                     const AcquiredCallback& callback,
                     const BluetoothAudioSink::ErrorCallback& error_callback));
 
+  void StartDiscoverySessionWithFilter(

[armansito, 2015/04/16 19:13:54]

Why not just MOCK_METHOD here? Why do you need the raw one?

[jpawlowski1, 2015/04/16 19:36:27]

Because it takes scoped_ptr as argument, and that's the only workaround I'm
aware of, here's discussion about that:
https://groups.google.com/a/google.com/forum/#!topic/gmock-users/JtZd5hBw_qg

+      const scoped_ptr<BluetoothDiscoveryFilter> discovery_filter,
+      const DiscoverySessionCallback& callback,
+      const ErrorCallback& error_callback);
+
  protected:
   void DeleteOnCorrectThread() const override;
   void AddDiscoverySession(BluetoothDiscoveryFilter* discovery_filter,