Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(342)

Unified Diff: trunk/src/device/bluetooth/test/mock_bluetooth_device.h

Issue 224763003: Revert 261566 "device/bluetooth: Rename device::bluetooth_utils:..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « trunk/src/device/bluetooth/bluetooth_uuid_unittest.cc ('k') | trunk/src/device/device_tests.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/device/bluetooth/test/mock_bluetooth_device.h
===================================================================
--- trunk/src/device/bluetooth/test/mock_bluetooth_device.h (revision 261569)
+++ trunk/src/device/bluetooth/test/mock_bluetooth_device.h (working copy)
@@ -10,7 +10,6 @@
#include "base/strings/string16.h"
#include "device/bluetooth/bluetooth_device.h"
#include "device/bluetooth/bluetooth_out_of_band_pairing_data.h"
-#include "device/bluetooth/bluetooth_uuid.h"
#include "testing/gmock/include/gmock/gmock.h"
namespace device {
@@ -59,7 +58,7 @@
const BluetoothDevice::ErrorCallback& error_callback));
MOCK_METHOD1(Forget, void(const BluetoothDevice::ErrorCallback&));
MOCK_METHOD2(ConnectToService,
- void(const BluetoothUUID&,
+ void(const std::string&,
const BluetoothDevice::SocketCallback&));
MOCK_METHOD3(ConnectToProfile,
void(BluetoothProfile*,
« no previous file with comments | « trunk/src/device/bluetooth/bluetooth_uuid_unittest.cc ('k') | trunk/src/device/device_tests.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698