Index: device/bluetooth/bluetooth_adapter_chromeos_devices_unittest.cc |
diff --git a/chrome/browser/chromeos/bluetooth/bluetooth_adapter_devices_chromeos_unittest.cc b/device/bluetooth/bluetooth_adapter_chromeos_devices_unittest.cc |
similarity index 90% |
rename from chrome/browser/chromeos/bluetooth/bluetooth_adapter_devices_chromeos_unittest.cc |
rename to device/bluetooth/bluetooth_adapter_chromeos_devices_unittest.cc |
index d1c1805f635facbeb9135bd738af874fbd015866..0ff8d3ddbdf920946ec03a8c397c1515c6163892 100644 |
--- a/chrome/browser/chromeos/bluetooth/bluetooth_adapter_devices_chromeos_unittest.cc |
+++ b/device/bluetooth/bluetooth_adapter_chromeos_devices_unittest.cc |
@@ -2,17 +2,21 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "chrome/browser/chromeos/bluetooth/bluetooth_adapter.h" |
-#include "chrome/browser/chromeos/bluetooth/bluetooth_adapter_chromeos.h" |
-#include "chrome/browser/chromeos/bluetooth/bluetooth_adapter_factory.h" |
-#include "chrome/browser/chromeos/bluetooth/test/mock_bluetooth_adapter.h" |
#include "chromeos/dbus/mock_bluetooth_adapter_client.h" |
#include "chromeos/dbus/mock_bluetooth_device_client.h" |
#include "chromeos/dbus/mock_bluetooth_manager_client.h" |
#include "chromeos/dbus/mock_dbus_thread_manager.h" |
#include "dbus/object_path.h" |
+#include "device/bluetooth/bluetooth_adapter.h" |
+#include "device/bluetooth/bluetooth_adapter_chromeos.h" |
+#include "device/bluetooth/bluetooth_adapter_factory.h" |
+#include "device/bluetooth/test/mock_bluetooth_adapter.h" |
#include "testing/gtest/include/gtest/gtest.h" |
+using device::BluetoothAdapter; |
+using device::BluetoothAdapterFactory; |
+using device::BluetoothDevice; |
+using device::MockBluetoothAdapter; |
using ::testing::_; |
using ::testing::Mock; |
using ::testing::Return; |
@@ -20,7 +24,7 @@ using ::testing::SaveArg; |
namespace chromeos { |
-class BluetoothAdapterDevicesChromeOsTest : public testing::Test { |
+class BluetoothAdapterChromeOsDevicesTest : public testing::Test { |
public: |
virtual void SetUp() { |
MockDBusThreadManager* mock_dbus_thread_manager = new MockDBusThreadManager; |
@@ -49,6 +53,7 @@ class BluetoothAdapterDevicesChromeOsTest : public testing::Test { |
.Times(1); |
adapter_ = BluetoothAdapterFactory::DefaultAdapter(); |
+ ASSERT_TRUE(adapter_.get() != NULL); |
// Call the adapter callback; |
// BluetoothAdapterClient::GetProperties will be called once to obtain |
@@ -103,12 +108,12 @@ class BluetoothAdapterDevicesChromeOsTest : public testing::Test { |
MockBluetoothAdapter::Observer adapter_observer_; |
}; |
-const dbus::ObjectPath BluetoothAdapterDevicesChromeOsTest::adapter_path_( |
+const dbus::ObjectPath BluetoothAdapterChromeOsDevicesTest::adapter_path_( |
"/fake/hci0"); |
-const std::string BluetoothAdapterDevicesChromeOsTest::adapter_address_ = |
+const std::string BluetoothAdapterChromeOsDevicesTest::adapter_address_ = |
"CA:FE:4A:C0:FE:FE"; |
-TEST_F(BluetoothAdapterDevicesChromeOsTest, DeviceRemovedAfterFound) { |
+TEST_F(BluetoothAdapterChromeOsDevicesTest, DeviceRemovedAfterFound) { |
const dbus::ObjectPath device_path("/fake/hci0/dev_ba_c0_11_00_00_01"); |
const std::string device_address = "BA:C0:11:00:00:01"; |