Index: device/bluetooth/bluetooth_adapter_chromeos_unittest.cc |
diff --git a/chrome/browser/chromeos/bluetooth/bluetooth_adapter_chromeos_unittest.cc b/device/bluetooth/bluetooth_adapter_chromeos_unittest.cc |
similarity index 99% |
rename from chrome/browser/chromeos/bluetooth/bluetooth_adapter_chromeos_unittest.cc |
rename to device/bluetooth/bluetooth_adapter_chromeos_unittest.cc |
index d909559cc5f53e8d809b5945086884eb3f67fe09..890d24141246720297b4b83f7478d0d02b23ea9a 100644 |
--- a/chrome/browser/chromeos/bluetooth/bluetooth_adapter_chromeos_unittest.cc |
+++ b/device/bluetooth/bluetooth_adapter_chromeos_unittest.cc |
@@ -2,16 +2,19 @@ |
// 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_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::MockBluetoothAdapter; |
using ::testing::_; |
using ::testing::InSequence; |
using ::testing::Return; |
@@ -67,6 +70,7 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterNotPresent) { |
scoped_refptr<BluetoothAdapter> adapter = |
BluetoothAdapterFactory::DefaultAdapter(); |
+ ASSERT_TRUE(adapter.get() != NULL); |
// Call the adapter callback; make out it failed. |
// BluetoothAdapter::Observer::AdapterPresentChanged must not be called. |