chrome.bluetooth API improvements.

device/bluetooth/test/mock_bluetooth_socket.h

Index: device/bluetooth/test/mock_bluetooth_socket.h
diff --git a/device/bluetooth/test/mock_bluetooth_socket.h b/device/bluetooth/test/mock_bluetooth_socket.h
index 8b5e1426aa77a005e47b8ad72e73707a0bb008c4..6ddcae8554c3f7fb94625f310c0832d3dc6ad7fc 100644
--- a/device/bluetooth/test/mock_bluetooth_socket.h
+++ b/device/bluetooth/test/mock_bluetooth_socket.h
@@ -8,23 +8,27 @@
 #include <string>
 
 #include "device/bluetooth/bluetooth_socket.h"
+#include "net/base/io_buffer.h"

[keybuk, 2014/03/20 01:21:56]

seems like you can avoid this include by

namespace net {

class IOBuffer;

}  // namespace net

[rpaquay, 2014/03/20 18:21:11]

That didn't work (on Windows at least). I think it is because MOCK_METHOD4 below
is a template class with implementation requiring fully knowing about the
parameter types.

[keybuk, 2014/03/20 18:38:40]

Ack

 #include "testing/gmock/include/gmock/gmock.h"
 
-namespace net {
-
-class DrainableIOBuffer;
-class GrowableIOBuffer;
-
-}  // namespace net
-
 namespace device {
 
 class MockBluetoothSocket : public BluetoothSocket {
  public:
   MockBluetoothSocket();
-  MOCK_METHOD1(Receive, bool(net::GrowableIOBuffer*));
-  MOCK_METHOD1(Send, bool(net::DrainableIOBuffer*));
-  MOCK_CONST_METHOD0(GetLastErrorMessage, std::string());
+  MOCK_METHOD2(Connect,
+               void(const base::Closure& success_callback,
+                    const ErrorCompletionCallback& error_callback));
+  MOCK_METHOD1(Disconnect, void(const base::Closure& callback));
+  MOCK_METHOD3(Receive,
+               void(int count,
+                    const ReceiveCompletionCallback& success_callback,
+                    const ReceiveErrorCompletionCallback& error_callback));
+  MOCK_METHOD4(Send,
+               void(scoped_refptr<net::IOBuffer> buffer,
+                    int buffer_size,
+                    const SendCompletionCallback& success_callback,
+                    const ErrorCompletionCallback& error_callback));
 
  protected:
   virtual ~MockBluetoothSocket();