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

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

Issue 11075006: Moved bluetooth adapter files to device/bluetooth/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: renamed 'bluetooth' target to 'device_bluetooth'. Created 8 years, 2 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
Index: device/bluetooth/test/mock_bluetooth_device.h
diff --git a/chrome/browser/chromeos/bluetooth/test/mock_bluetooth_device.h b/device/bluetooth/test/mock_bluetooth_device.h
similarity index 85%
rename from chrome/browser/chromeos/bluetooth/test/mock_bluetooth_device.h
rename to device/bluetooth/test/mock_bluetooth_device.h
index 650928cb4cdd41323c589323203d095dcca92f71..e917a30c42eb8c5f000dece8302db578343c12b8 100644
--- a/chrome/browser/chromeos/bluetooth/test/mock_bluetooth_device.h
+++ b/device/bluetooth/test/mock_bluetooth_device.h
@@ -2,17 +2,19 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_CHROMEOS_BLUETOOTH_TEST_MOCK_BLUETOOTH_DEVICE_H_
-#define CHROME_BROWSER_CHROMEOS_BLUETOOTH_TEST_MOCK_BLUETOOTH_DEVICE_H_
+#ifndef DEVICE_BLUETOOTH_TEST_MOCK_BLUETOOTH_DEVICE_H_
+#define DEVICE_BLUETOOTH_TEST_MOCK_BLUETOOTH_DEVICE_H_
#include <string>
#include "base/string16.h"
-#include "chrome/browser/chromeos/bluetooth/bluetooth_device.h"
-#include "chromeos/dbus/bluetooth_out_of_band_pairing_data.h"
+#include "device/bluetooth/bluetooth_device.h"
+#include "device/bluetooth/bluetooth_out_of_band_pairing_data.h"
#include "testing/gmock/include/gmock/gmock.h"
-namespace chromeos {
+namespace device {
+
+class MockBluetoothAdapter;
class MockBluetoothDevice : public BluetoothDevice {
public:
@@ -59,7 +61,7 @@ class MockBluetoothDevice : public BluetoothDevice {
const BluetoothDevice::SocketCallback&));
MOCK_METHOD3(SetOutOfBandPairingData,
- void(const chromeos::BluetoothOutOfBandPairingData& data,
+ void(const BluetoothOutOfBandPairingData& data,
const base::Closure& callback,
const BluetoothDevice::ErrorCallback& error_callback));
MOCK_METHOD2(ClearOutOfBandPairingData,
@@ -72,6 +74,6 @@ class MockBluetoothDevice : public BluetoothDevice {
BluetoothDevice::ServiceList service_list_;
};
-} // namespace chromeos
+} // namespace device
-#endif // CHROME_BROWSER_CHROMEOS_BLUETOOTH_TEST_MOCK_BLUETOOTH_DEVICE_H_
+#endif // DEVICE_BLUETOOTH_TEST_MOCK_BLUETOOTH_DEVICE_H_

Powered by Google App Engine
This is Rietveld 408576698