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

Unified Diff: chrome/browser/chromeos/bluetooth/test/mock_bluetooth_device_dbus.cc

Issue 10899037: Refactoring bluetooth API code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Added #include <string> into bluetooth_adapter_dbus.cc. Created 8 years, 3 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: chrome/browser/chromeos/bluetooth/test/mock_bluetooth_device_dbus.cc
diff --git a/chrome/browser/chromeos/bluetooth/test/mock_bluetooth_device.cc b/chrome/browser/chromeos/bluetooth/test/mock_bluetooth_device_dbus.cc
similarity index 63%
rename from chrome/browser/chromeos/bluetooth/test/mock_bluetooth_device.cc
rename to chrome/browser/chromeos/bluetooth/test/mock_bluetooth_device_dbus.cc
index 5bc0cf7a428e6affa7afb624a6572eb274ce2190..4f3f5f0cf1950a38e9c1e69447d92234d92ec2f6 100644
--- a/chrome/browser/chromeos/bluetooth/test/mock_bluetooth_device.cc
+++ b/chrome/browser/chromeos/bluetooth/test/mock_bluetooth_device_dbus.cc
@@ -3,18 +3,19 @@
// found in the LICENSE file.
#include "base/utf_string_conversions.h"
-#include "chrome/browser/chromeos/bluetooth/test/mock_bluetooth_adapter.h"
-#include "chrome/browser/chromeos/bluetooth/test/mock_bluetooth_device.h"
+#include "chrome/browser/chromeos/bluetooth/test/mock_bluetooth_adapter_dbus.h"
+#include "chrome/browser/chromeos/bluetooth/test/mock_bluetooth_device_dbus.h"
namespace chromeos {
-MockBluetoothDevice::MockBluetoothDevice(MockBluetoothAdapter* adapter,
- const std::string& name,
- const std::string& address,
- bool paired,
- bool bonded,
- bool connected)
- : BluetoothDevice(adapter),
+MockBluetoothDeviceDBus::MockBluetoothDeviceDBus(
+ MockBluetoothAdapterDBus* adapter,
+ const std::string& name,
+ const std::string& address,
+ bool paired,
+ bool bonded,
+ bool connected)
+ : BluetoothDeviceDBus(adapter),
name_(UTF8ToUTF16(name)),
address_(address) {
ON_CALL(*this, GetName())
@@ -29,6 +30,6 @@ MockBluetoothDevice::MockBluetoothDevice(MockBluetoothAdapter* adapter,
.WillByDefault(testing::Return(connected));
}
-MockBluetoothDevice::~MockBluetoothDevice() {}
+MockBluetoothDeviceDBus::~MockBluetoothDeviceDBus() {}
} // namespace chromeos

Powered by Google App Engine
This is Rietveld 408576698