| 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 78%
|
| rename from chrome/browser/chromeos/bluetooth/bluetooth_adapter_devices_chromeos_unittest.cc
|
| rename to device/bluetooth/bluetooth_adapter_chromeos_devices_unittest.cc
|
| index d1c1805f635facbeb9135bd738af874fbd015866..431e21bcf7fd300ab719f49d0819c35bb06edfa3 100644
|
| --- a/chrome/browser/chromeos/bluetooth/bluetooth_adapter_devices_chromeos_unittest.cc
|
| +++ b/device/bluetooth/bluetooth_adapter_chromeos_devices_unittest.cc
|
| @@ -2,15 +2,15 @@
|
| // 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 ::testing::_;
|
| @@ -18,16 +18,17 @@ using ::testing::Mock;
|
| using ::testing::Return;
|
| using ::testing::SaveArg;
|
|
|
| -namespace chromeos {
|
| +namespace bluetooth {
|
|
|
| -class BluetoothAdapterDevicesChromeOsTest : public testing::Test {
|
| +class BluetoothAdapterChromeOsDevicesTest : public testing::Test {
|
| public:
|
| virtual void SetUp() {
|
| - MockDBusThreadManager* mock_dbus_thread_manager = new MockDBusThreadManager;
|
| + chromeos::MockDBusThreadManager* mock_dbus_thread_manager =
|
| + new chromeos::MockDBusThreadManager;
|
|
|
| EXPECT_CALL(*mock_dbus_thread_manager, GetSystemBus())
|
| .WillRepeatedly(Return(reinterpret_cast<dbus::Bus*>(NULL)));
|
| - DBusThreadManager::InitializeForTesting(mock_dbus_thread_manager);
|
| + chromeos::DBusThreadManager::InitializeForTesting(mock_dbus_thread_manager);
|
|
|
| mock_manager_client_ =
|
| mock_dbus_thread_manager->mock_bluetooth_manager_client();
|
| @@ -39,7 +40,7 @@ class BluetoothAdapterDevicesChromeOsTest : public testing::Test {
|
| // Create the default adapter instance;
|
| // BluetoothManagerClient::DefaultAdapter will be called once, passing
|
| // a callback to obtain the adapter path.
|
| - BluetoothManagerClient::AdapterCallback adapter_callback;
|
| + chromeos::BluetoothManagerClient::AdapterCallback adapter_callback;
|
| EXPECT_CALL(*mock_manager_client_, DefaultAdapter(_))
|
| .WillOnce(SaveArg<0>(&adapter_callback));
|
|
|
| @@ -49,11 +50,12 @@ 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
|
| // the property set.
|
| - MockBluetoothAdapterClient::Properties adapter_properties;
|
| + chromeos::MockBluetoothAdapterClient::Properties adapter_properties;
|
| adapter_properties.address.ReplaceValue(adapter_address_);
|
| adapter_properties.powered.ReplaceValue(true);
|
|
|
| @@ -88,13 +90,13 @@ class BluetoothAdapterDevicesChromeOsTest : public testing::Test {
|
| .Times(1);
|
|
|
| adapter_ = NULL;
|
| - DBusThreadManager::Shutdown();
|
| + chromeos::DBusThreadManager::Shutdown();
|
| }
|
|
|
| protected:
|
| - MockBluetoothManagerClient* mock_manager_client_;
|
| - MockBluetoothAdapterClient* mock_adapter_client_;
|
| - MockBluetoothDeviceClient* mock_device_client_;
|
| + chromeos::MockBluetoothManagerClient* mock_manager_client_;
|
| + chromeos::MockBluetoothAdapterClient* mock_adapter_client_;
|
| + chromeos::MockBluetoothDeviceClient* mock_device_client_;
|
|
|
| static const dbus::ObjectPath adapter_path_;
|
| static const std::string adapter_address_;
|
| @@ -103,16 +105,16 @@ 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";
|
|
|
| - MockBluetoothDeviceClient::Properties device_properties;
|
| + chromeos::MockBluetoothDeviceClient::Properties device_properties;
|
| device_properties.address.ReplaceValue(device_address);
|
| device_properties.name.ReplaceValue("Fake Keyboard");
|
| device_properties.bluetooth_class.ReplaceValue(0x2540);
|
| @@ -127,7 +129,7 @@ TEST_F(BluetoothAdapterDevicesChromeOsTest, DeviceRemovedAfterFound) {
|
|
|
| BluetoothAdapterChromeOs* adapter_chromeos =
|
| static_cast<BluetoothAdapterChromeOs*>(adapter_.get());
|
| - static_cast<BluetoothAdapterClient::Observer*>(adapter_chromeos)
|
| + static_cast<chromeos::BluetoothAdapterClient::Observer*>(adapter_chromeos)
|
| ->DeviceFound(adapter_path_, device_address, device_properties);
|
|
|
| // Now inform the adapter that the device has been added and assigned an
|
| @@ -141,7 +143,7 @@ TEST_F(BluetoothAdapterDevicesChromeOsTest, DeviceRemovedAfterFound) {
|
| EXPECT_CALL(adapter_observer_, DeviceChanged(adapter_chromeos, device))
|
| .Times(1);
|
|
|
| - static_cast<BluetoothAdapterClient::Observer*>(adapter_chromeos)
|
| + static_cast<chromeos::BluetoothAdapterClient::Observer*>(adapter_chromeos)
|
| ->DeviceCreated(adapter_path_, device_path);
|
|
|
| // Finally remove the adapter again;
|
| @@ -152,7 +154,7 @@ TEST_F(BluetoothAdapterDevicesChromeOsTest, DeviceRemovedAfterFound) {
|
| EXPECT_CALL(adapter_observer_, DeviceChanged(adapter_.get(), device))
|
| .Times(1);
|
|
|
| - static_cast<BluetoothAdapterClient::Observer*>(adapter_chromeos)
|
| + static_cast<chromeos::BluetoothAdapterClient::Observer*>(adapter_chromeos)
|
| ->DeviceRemoved(adapter_path_, device_path);
|
|
|
| // Verify that the device is still visible, just no longer paired.
|
| @@ -160,4 +162,4 @@ TEST_F(BluetoothAdapterDevicesChromeOsTest, DeviceRemovedAfterFound) {
|
| EXPECT_FALSE(device->IsPaired());
|
| }
|
|
|
| -} // namespace chromeos
|
| +} // namespace bluetooth
|
|
|