Moved bluetooth adapter files to device/bluetooth/.

device/bluetooth/bluetooth_adapter_chromeos_unittest.cc

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 88%
rename from chrome/browser/chromeos/bluetooth/bluetooth_adapter_chromeos_unittest.cc
rename to device/bluetooth/bluetooth_adapter_chromeos_unittest.cc
index d909559cc5f53e8d809b5945086884eb3f67fe09..c418e2a68d564db5d2cf63dd34d6ce201122dcde 100644
--- a/chrome/browser/chromeos/bluetooth/bluetooth_adapter_chromeos_unittest.cc
+++ b/device/bluetooth/bluetooth_adapter_chromeos_unittest.cc
@@ -2,14 +2,14 @@
 // 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 ::testing::_;
@@ -17,16 +17,17 @@ using ::testing::InSequence;
 using ::testing::Return;
 using ::testing::SaveArg;
 
-namespace chromeos {
+namespace bluetooth {
 
 class BluetoothAdapterChromeOsTest : 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();
@@ -38,7 +39,7 @@ class BluetoothAdapterChromeOsTest : public testing::Test {
   }
 
   virtual void TearDown() {
-    DBusThreadManager::Shutdown();
+    chromeos::DBusThreadManager::Shutdown();
   }
 
   void SetCallback() {
@@ -50,8 +51,8 @@ class BluetoothAdapterChromeOsTest : public testing::Test {
   }
 
  protected:
-  MockBluetoothManagerClient* mock_manager_client_;
-  MockBluetoothAdapterClient* mock_adapter_client_;
+  chromeos::MockBluetoothManagerClient* mock_manager_client_;
+  chromeos::MockBluetoothAdapterClient* mock_adapter_client_;
 
   bool set_callback_called_;
   bool error_callback_called_;
@@ -61,12 +62,13 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterNotPresent) {
   // 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));
 
   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.
@@ -89,7 +91,7 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterWithAddress) {
   // 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));
 
@@ -99,7 +101,7 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterWithAddress) {
   // 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);
 
   EXPECT_CALL(*mock_adapter_client_, GetProperties(adapter_path))
@@ -127,7 +129,7 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterWithoutAddress) {
   // 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));
 
@@ -137,7 +139,7 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterWithoutAddress) {
   // Call the adapter callback;
   // BluetoothAdapterClient::GetProperties will be called once to obtain
   // the property set.
-  MockBluetoothAdapterClient::Properties adapter_properties;
+  chromeos::MockBluetoothAdapterClient::Properties adapter_properties;
 
   EXPECT_CALL(*mock_adapter_client_, GetProperties(adapter_path))
       .WillRepeatedly(Return(&adapter_properties));
@@ -165,7 +167,7 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterWithoutAddress) {
   BluetoothAdapterChromeOs* adapter_chromeos =
       static_cast<BluetoothAdapterChromeOs*>(adapter.get());
 
-  static_cast<BluetoothAdapterClient::Observer*>(adapter_chromeos)
+  static_cast<chromeos::BluetoothAdapterClient::Observer*>(adapter_chromeos)
       ->AdapterPropertyChanged(adapter_path,
                                adapter_properties.address.name());
 
@@ -181,7 +183,7 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterBecomesPresentWithAddress) {
   // 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));
 
@@ -194,7 +196,7 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterBecomesPresentWithAddress) {
   // Tell the adapter the default adapter changed;
   // 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);
 
   EXPECT_CALL(*mock_adapter_client_, GetProperties(adapter_path))
@@ -210,7 +212,7 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterBecomesPresentWithAddress) {
   BluetoothAdapterChromeOs* adapter_chromeos =
       static_cast<BluetoothAdapterChromeOs*>(adapter.get());
 
-  static_cast<BluetoothManagerClient::Observer*>(adapter_chromeos)
+  static_cast<chromeos::BluetoothManagerClient::Observer*>(adapter_chromeos)
       ->DefaultAdapterChanged(adapter_path);
 
   // Adapter should be present with the new address.
@@ -227,7 +229,7 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterReplacedWithAddress) {
   // 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));
 
@@ -237,7 +239,7 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterReplacedWithAddress) {
   // Call the adapter callback;
   // BluetoothAdapterClient::GetProperties will be called once to obtain
   // the property set.
-  MockBluetoothAdapterClient::Properties initial_adapter_properties;
+  chromeos::MockBluetoothAdapterClient::Properties initial_adapter_properties;
   initial_adapter_properties.address.ReplaceValue(initial_adapter_address);
 
   EXPECT_CALL(*mock_adapter_client_, GetProperties(initial_adapter_path))
@@ -248,7 +250,7 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterReplacedWithAddress) {
   // Tell the adapter the default adapter changed;
   // BluetoothAdapterClient::GetProperties will be called once to obtain
   // the property set.
-  MockBluetoothAdapterClient::Properties new_adapter_properties;
+  chromeos::MockBluetoothAdapterClient::Properties new_adapter_properties;
   new_adapter_properties.address.ReplaceValue(new_adapter_address);
 
   EXPECT_CALL(*mock_adapter_client_, GetProperties(new_adapter_path))
@@ -268,7 +270,7 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterReplacedWithAddress) {
   BluetoothAdapterChromeOs* adapter_chromeos =
       static_cast<BluetoothAdapterChromeOs*>(adapter.get());
 
-  static_cast<BluetoothManagerClient::Observer*>(adapter_chromeos)
+  static_cast<chromeos::BluetoothManagerClient::Observer*>(adapter_chromeos)
       ->DefaultAdapterChanged(new_adapter_path);
 
   // Adapter should be present with the new address.
@@ -284,7 +286,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
   // 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));
 
@@ -297,7 +299,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
   // Tell the adapter the default adapter changed;
   // BluetoothAdapterClient::GetProperties will be called once to obtain
   // the property set.
-  MockBluetoothAdapterClient::Properties adapter_properties;
+  chromeos::MockBluetoothAdapterClient::Properties adapter_properties;
 
   EXPECT_CALL(*mock_adapter_client_, GetProperties(adapter_path))
       .WillRepeatedly(Return(&adapter_properties));
@@ -312,7 +314,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
   BluetoothAdapterChromeOs* adapter_chromeos =
       static_cast<BluetoothAdapterChromeOs*>(adapter.get());
 
-  static_cast<BluetoothManagerClient::Observer*>(adapter_chromeos)
+  static_cast<chromeos::BluetoothManagerClient::Observer*>(adapter_chromeos)
       ->DefaultAdapterChanged(adapter_path);
 
   // Adapter should not be present yet.
@@ -325,7 +327,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
   EXPECT_CALL(adapter_observer, AdapterPresentChanged(adapter.get(), true))
       .Times(1);
 
-  static_cast<BluetoothAdapterClient::Observer*>(adapter_chromeos)
+  static_cast<chromeos::BluetoothAdapterClient::Observer*>(adapter_chromeos)
       ->AdapterPropertyChanged(adapter_path,
                                adapter_properties.address.name());
 
@@ -343,7 +345,7 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterReplacedWithoutAddress) {
   // 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));
 
@@ -353,7 +355,7 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterReplacedWithoutAddress) {
   // Call the adapter callback;
   // BluetoothAdapterClient::GetProperties will be called once to obtain
   // the property set.
-  MockBluetoothAdapterClient::Properties initial_adapter_properties;
+  chromeos::MockBluetoothAdapterClient::Properties initial_adapter_properties;
   initial_adapter_properties.address.ReplaceValue(initial_adapter_address);
 
   EXPECT_CALL(*mock_adapter_client_, GetProperties(initial_adapter_path))
@@ -364,7 +366,7 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterReplacedWithoutAddress) {
   // Tell the adapter the default adapter changed;
   // BluetoothAdapterClient::GetProperties will be called once to obtain
   // the property set.
-  MockBluetoothAdapterClient::Properties new_adapter_properties;
+  chromeos::MockBluetoothAdapterClient::Properties new_adapter_properties;
 
   EXPECT_CALL(*mock_adapter_client_, GetProperties(new_adapter_path))
       .WillRepeatedly(Return(&new_adapter_properties));
@@ -380,7 +382,7 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterReplacedWithoutAddress) {
   BluetoothAdapterChromeOs* adapter_chromeos =
       static_cast<BluetoothAdapterChromeOs*>(adapter.get());
 
-  static_cast<BluetoothManagerClient::Observer*>(adapter_chromeos)
+  static_cast<chromeos::BluetoothManagerClient::Observer*>(adapter_chromeos)
       ->DefaultAdapterChanged(new_adapter_path);
 
   // Adapter should be now marked not present.
@@ -393,7 +395,7 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterReplacedWithoutAddress) {
   EXPECT_CALL(adapter_observer, AdapterPresentChanged(adapter.get(), true))
       .Times(1);
 
-  static_cast<BluetoothAdapterClient::Observer*>(adapter_chromeos)
+  static_cast<chromeos::BluetoothAdapterClient::Observer*>(adapter_chromeos)
       ->AdapterPropertyChanged(new_adapter_path,
                                new_adapter_properties.address.name());
 
@@ -409,7 +411,7 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterRemoved) {
   // 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));
 
@@ -419,7 +421,7 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterRemoved) {
   // 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);
 
   EXPECT_CALL(*mock_adapter_client_, GetProperties(adapter_path))
@@ -439,7 +441,7 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterRemoved) {
   BluetoothAdapterChromeOs* adapter_chromeos =
       static_cast<BluetoothAdapterChromeOs*>(adapter.get());
 
-  static_cast<BluetoothManagerClient::Observer*>(adapter_chromeos)
+  static_cast<chromeos::BluetoothManagerClient::Observer*>(adapter_chromeos)
       ->AdapterRemoved(adapter_path);
 
   // Adapter should be no longer present.
@@ -452,7 +454,7 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterWithoutAddressRemoved) {
   // 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));
 
@@ -462,7 +464,7 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterWithoutAddressRemoved) {
   // Call the adapter callback;
   // BluetoothAdapterClient::GetProperties will be called once to obtain
   // the property set.
-  MockBluetoothAdapterClient::Properties adapter_properties;
+  chromeos::MockBluetoothAdapterClient::Properties adapter_properties;
 
   EXPECT_CALL(*mock_adapter_client_, GetProperties(adapter_path))
       .WillRepeatedly(Return(&adapter_properties));
@@ -481,7 +483,7 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterWithoutAddressRemoved) {
   BluetoothAdapterChromeOs* adapter_chromeos =
       static_cast<BluetoothAdapterChromeOs*>(adapter.get());
 
-  static_cast<BluetoothManagerClient::Observer*>(adapter_chromeos)
+  static_cast<chromeos::BluetoothManagerClient::Observer*>(adapter_chromeos)
       ->AdapterRemoved(adapter_path);
 
   // Adapter should be still no longer present.
@@ -496,7 +498,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
   // 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));
 
@@ -506,7 +508,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
   // 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(false);
 
@@ -527,7 +529,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
   // 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));
 
@@ -537,7 +539,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
   // 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);
 
@@ -568,7 +570,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
   // 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));
 
@@ -579,7 +581,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
   // BluetoothAdapterClient::GetProperties will be called once to obtain
   // the property set but BluetoothAdapter::Observer::AdapterPoweredChanged
   // should not yet be called.
-  MockBluetoothAdapterClient::Properties adapter_properties;
+  chromeos::MockBluetoothAdapterClient::Properties adapter_properties;
   adapter_properties.powered.ReplaceValue(true);
 
   MockBluetoothAdapter::Observer adapter_observer;
@@ -610,7 +612,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
   BluetoothAdapterChromeOs* adapter_chromeos =
       static_cast<BluetoothAdapterChromeOs*>(adapter.get());
 
-  static_cast<BluetoothAdapterClient::Observer*>(adapter_chromeos)
+  static_cast<chromeos::BluetoothAdapterClient::Observer*>(adapter_chromeos)
       ->AdapterPropertyChanged(adapter_path,
                                adapter_properties.address.name());
 
@@ -625,7 +627,7 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterPoweredPropertyChanged) {
   // 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));
 
@@ -635,7 +637,7 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterPoweredPropertyChanged) {
   // 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(false);
 
@@ -660,7 +662,7 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterPoweredPropertyChanged) {
   BluetoothAdapterChromeOs* adapter_chromeos =
       static_cast<BluetoothAdapterChromeOs*>(adapter.get());
 
-  static_cast<BluetoothAdapterClient::Observer*>(adapter_chromeos)
+  static_cast<chromeos::BluetoothAdapterClient::Observer*>(adapter_chromeos)
       ->AdapterPropertyChanged(adapter_path,
                                adapter_properties.powered.name());
 
@@ -675,7 +677,7 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterPoweredPropertyUnchanged) {
   // 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));
 
@@ -685,7 +687,7 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterPoweredPropertyUnchanged) {
   // 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);
 
@@ -708,7 +710,7 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterPoweredPropertyUnchanged) {
   BluetoothAdapterChromeOs* adapter_chromeos =
       static_cast<BluetoothAdapterChromeOs*>(adapter.get());
 
-  static_cast<BluetoothAdapterClient::Observer*>(adapter_chromeos)
+  static_cast<chromeos::BluetoothAdapterClient::Observer*>(adapter_chromeos)
       ->AdapterPropertyChanged(adapter_path,
                                adapter_properties.powered.name());
 
@@ -724,7 +726,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
   // 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));
 
@@ -735,7 +737,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
   // BluetoothAdapterClient::GetProperties will be called once to obtain
   // the property set but BluetoothAdapter::Observer::AdapterPoweredChanged
   // should not yet be called.
-  MockBluetoothAdapterClient::Properties adapter_properties;
+  chromeos::MockBluetoothAdapterClient::Properties adapter_properties;
 
   MockBluetoothAdapter::Observer adapter_observer;
   adapter->AddObserver(&adapter_observer);
@@ -759,7 +761,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
   BluetoothAdapterChromeOs* adapter_chromeos =
       static_cast<BluetoothAdapterChromeOs*>(adapter.get());
 
-  static_cast<BluetoothAdapterClient::Observer*>(adapter_chromeos)
+  static_cast<chromeos::BluetoothAdapterClient::Observer*>(adapter_chromeos)
       ->AdapterPropertyChanged(adapter_path,
                                adapter_properties.powered.name());
 
@@ -777,7 +779,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
   EXPECT_CALL(adapter_observer, AdapterPoweredChanged(adapter.get(), true))
       .Times(1);
 
-  static_cast<BluetoothAdapterClient::Observer*>(adapter_chromeos)
+  static_cast<chromeos::BluetoothAdapterClient::Observer*>(adapter_chromeos)
       ->AdapterPropertyChanged(adapter_path,
                                adapter_properties.address.name());
 
@@ -795,7 +797,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
   // 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));
 
@@ -805,7 +807,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
   // Call the adapter callback;
   // BluetoothAdapterClient::GetProperties will be called once to obtain
   // the property set.
-  MockBluetoothAdapterClient::Properties initial_adapter_properties;
+  chromeos::MockBluetoothAdapterClient::Properties initial_adapter_properties;
   initial_adapter_properties.address.ReplaceValue(initial_adapter_address);
   initial_adapter_properties.powered.ReplaceValue(true);
 
@@ -817,7 +819,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
   // Tell the adapter the default adapter changed;
   // BluetoothAdapterClient::GetProperties will be called once to obtain
   // the property set.
-  MockBluetoothAdapterClient::Properties new_adapter_properties;
+  chromeos::MockBluetoothAdapterClient::Properties new_adapter_properties;
   new_adapter_properties.address.ReplaceValue(new_adapter_address);
 
   EXPECT_CALL(*mock_adapter_client_, GetProperties(new_adapter_path))
@@ -842,7 +844,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
   BluetoothAdapterChromeOs* adapter_chromeos =
       static_cast<BluetoothAdapterChromeOs*>(adapter.get());
 
-  static_cast<BluetoothManagerClient::Observer*>(adapter_chromeos)
+  static_cast<chromeos::BluetoothManagerClient::Observer*>(adapter_chromeos)
       ->DefaultAdapterChanged(new_adapter_path);
 
   // Adapter should have the new property value.
@@ -859,7 +861,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
   // 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));
 
@@ -869,7 +871,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
   // Call the adapter callback;
   // BluetoothAdapterClient::GetProperties will be called once to obtain
   // the property set.
-  MockBluetoothAdapterClient::Properties initial_adapter_properties;
+  chromeos::MockBluetoothAdapterClient::Properties initial_adapter_properties;
   initial_adapter_properties.address.ReplaceValue(initial_adapter_address);
   initial_adapter_properties.powered.ReplaceValue(true);
 
@@ -881,7 +883,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
   // Tell the adapter the default adapter changed;
   // BluetoothAdapterClient::GetProperties will be called once to obtain
   // the property set.
-  MockBluetoothAdapterClient::Properties new_adapter_properties;
+  chromeos::MockBluetoothAdapterClient::Properties new_adapter_properties;
   new_adapter_properties.address.ReplaceValue(new_adapter_address);
   new_adapter_properties.powered.ReplaceValue(true);
 
@@ -915,7 +917,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
   BluetoothAdapterChromeOs* adapter_chromeos =
       static_cast<BluetoothAdapterChromeOs*>(adapter.get());
 
-  static_cast<BluetoothManagerClient::Observer*>(adapter_chromeos)
+  static_cast<chromeos::BluetoothManagerClient::Observer*>(adapter_chromeos)
       ->DefaultAdapterChanged(new_adapter_path);
 
   // Adapter should have the new property value.
@@ -930,7 +932,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
   // 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));
 
@@ -940,7 +942,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
   // 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);
 
@@ -962,7 +964,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
   BluetoothAdapterChromeOs* adapter_chromeos =
       static_cast<BluetoothAdapterChromeOs*>(adapter.get());
 
-  static_cast<BluetoothManagerClient::Observer*>(adapter_chromeos)
+  static_cast<chromeos::BluetoothManagerClient::Observer*>(adapter_chromeos)
       ->AdapterRemoved(adapter_path);
 
   // Adapter should have the new property value.
@@ -976,7 +978,7 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterSetPowered) {
   // 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));
 
@@ -986,7 +988,7 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterSetPowered) {
   // Call the adapter callback;
   // BluetoothAdapterClient::GetProperties will be called once to obtain
   // the property set.
-  MockBluetoothAdapterClient::Properties adapter_properties;
+  chromeos::MockBluetoothAdapterClient::Properties adapter_properties;
 
   EXPECT_CALL(*mock_adapter_client_, GetProperties(adapter_path))
       .WillRepeatedly(Return(&adapter_properties));
@@ -1024,7 +1026,7 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterSetPoweredError) {
   // 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));
 
@@ -1034,7 +1036,7 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterSetPoweredError) {
   // Call the adapter callback;
   // BluetoothAdapterClient::GetProperties will be called once to obtain
   // the property set.
-  MockBluetoothAdapterClient::Properties adapter_properties;
+  chromeos::MockBluetoothAdapterClient::Properties adapter_properties;
 
   EXPECT_CALL(*mock_adapter_client_, GetProperties(adapter_path))
       .WillRepeatedly(Return(&adapter_properties));
@@ -1073,7 +1075,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
   // 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));
 
@@ -1083,7 +1085,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
   // 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.discovering.ReplaceValue(false);
 
@@ -1104,7 +1106,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
   // 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));
 
@@ -1114,7 +1116,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
   // 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.discovering.ReplaceValue(true);
 
@@ -1145,7 +1147,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
   // 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));
 
@@ -1156,7 +1158,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
   // BluetoothAdapterClient::GetProperties will be called once to obtain
   // the property set but BluetoothAdapter::Observer::AdapterDiscoveringChanged
   // should not yet be called.
-  MockBluetoothAdapterClient::Properties adapter_properties;
+  chromeos::MockBluetoothAdapterClient::Properties adapter_properties;
   adapter_properties.discovering.ReplaceValue(true);
 
   MockBluetoothAdapter::Observer adapter_observer;
@@ -1187,7 +1189,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
   BluetoothAdapterChromeOs* adapter_chromeos =
       static_cast<BluetoothAdapterChromeOs*>(adapter.get());
 
-  static_cast<BluetoothAdapterClient::Observer*>(adapter_chromeos)
+  static_cast<chromeos::BluetoothAdapterClient::Observer*>(adapter_chromeos)
       ->AdapterPropertyChanged(adapter_path,
                                adapter_properties.address.name());
 
@@ -1202,7 +1204,7 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterDiscoveringPropertyChanged) {
   // 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));
 
@@ -1212,7 +1214,7 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterDiscoveringPropertyChanged) {
   // 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.discovering.ReplaceValue(false);
 
@@ -1237,7 +1239,7 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterDiscoveringPropertyChanged) {
   BluetoothAdapterChromeOs* adapter_chromeos =
       static_cast<BluetoothAdapterChromeOs*>(adapter.get());
 
-  static_cast<BluetoothAdapterClient::Observer*>(adapter_chromeos)
+  static_cast<chromeos::BluetoothAdapterClient::Observer*>(adapter_chromeos)
       ->AdapterPropertyChanged(adapter_path,
                                adapter_properties.discovering.name());
 
@@ -1253,7 +1255,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
   // 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));
 
@@ -1263,7 +1265,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
   // 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.discovering.ReplaceValue(true);
 
@@ -1287,7 +1289,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
   BluetoothAdapterChromeOs* adapter_chromeos =
       static_cast<BluetoothAdapterChromeOs*>(adapter.get());
 
-  static_cast<BluetoothAdapterClient::Observer*>(adapter_chromeos)
+  static_cast<chromeos::BluetoothAdapterClient::Observer*>(adapter_chromeos)
       ->AdapterPropertyChanged(adapter_path,
                                adapter_properties.discovering.name());
 
@@ -1303,7 +1305,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
   // 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));
 
@@ -1314,7 +1316,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
   // BluetoothAdapterClient::GetProperties will be called once to obtain
   // the property set but BluetoothAdapter::Observer::AdapterDiscoveringChanged
   // should not yet be called.
-  MockBluetoothAdapterClient::Properties adapter_properties;
+  chromeos::MockBluetoothAdapterClient::Properties adapter_properties;
 
   MockBluetoothAdapter::Observer adapter_observer;
   adapter->AddObserver(&adapter_observer);
@@ -1338,7 +1340,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
   BluetoothAdapterChromeOs* adapter_chromeos =
       static_cast<BluetoothAdapterChromeOs*>(adapter.get());
 
-  static_cast<BluetoothAdapterClient::Observer*>(adapter_chromeos)
+  static_cast<chromeos::BluetoothAdapterClient::Observer*>(adapter_chromeos)
       ->AdapterPropertyChanged(adapter_path,
                                adapter_properties.discovering.name());
 
@@ -1356,7 +1358,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
   EXPECT_CALL(adapter_observer, AdapterDiscoveringChanged(adapter.get(), true))
       .Times(1);
 
-  static_cast<BluetoothAdapterClient::Observer*>(adapter_chromeos)
+  static_cast<chromeos::BluetoothAdapterClient::Observer*>(adapter_chromeos)
       ->AdapterPropertyChanged(adapter_path,
                                adapter_properties.address.name());
 
@@ -1374,7 +1376,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
   // 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));
 
@@ -1384,7 +1386,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
   // Call the adapter callback;
   // BluetoothAdapterClient::GetProperties will be called once to obtain
   // the property set.
-  MockBluetoothAdapterClient::Properties initial_adapter_properties;
+  chromeos::MockBluetoothAdapterClient::Properties initial_adapter_properties;
   initial_adapter_properties.address.ReplaceValue(initial_adapter_address);
   initial_adapter_properties.discovering.ReplaceValue(true);
 
@@ -1396,7 +1398,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
   // Tell the adapter the default adapter changed;
   // BluetoothAdapterClient::GetProperties will be called once to obtain
   // the property set.
-  MockBluetoothAdapterClient::Properties new_adapter_properties;
+  chromeos::MockBluetoothAdapterClient::Properties new_adapter_properties;
   new_adapter_properties.address.ReplaceValue(new_adapter_address);
 
   EXPECT_CALL(*mock_adapter_client_, GetProperties(new_adapter_path))
@@ -1421,7 +1423,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
   BluetoothAdapterChromeOs* adapter_chromeos =
       static_cast<BluetoothAdapterChromeOs*>(adapter.get());
 
-  static_cast<BluetoothManagerClient::Observer*>(adapter_chromeos)
+  static_cast<chromeos::BluetoothManagerClient::Observer*>(adapter_chromeos)
       ->DefaultAdapterChanged(new_adapter_path);
 
   // Adapter should have the new property value.
@@ -1438,7 +1440,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
   // 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));
 
@@ -1448,7 +1450,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
   // Call the adapter callback;
   // BluetoothAdapterClient::GetProperties will be called once to obtain
   // the property set.
-  MockBluetoothAdapterClient::Properties initial_adapter_properties;
+  chromeos::MockBluetoothAdapterClient::Properties initial_adapter_properties;
   initial_adapter_properties.address.ReplaceValue(initial_adapter_address);
   initial_adapter_properties.discovering.ReplaceValue(true);
 
@@ -1460,7 +1462,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
   // Tell the adapter the default adapter changed;
   // BluetoothAdapterClient::GetProperties will be called once to obtain
   // the property set.
-  MockBluetoothAdapterClient::Properties new_adapter_properties;
+  chromeos::MockBluetoothAdapterClient::Properties new_adapter_properties;
   new_adapter_properties.address.ReplaceValue(new_adapter_address);
   new_adapter_properties.discovering.ReplaceValue(true);
 
@@ -1496,7 +1498,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
   BluetoothAdapterChromeOs* adapter_chromeos =
       static_cast<BluetoothAdapterChromeOs*>(adapter.get());
 
-  static_cast<BluetoothManagerClient::Observer*>(adapter_chromeos)
+  static_cast<chromeos::BluetoothManagerClient::Observer*>(adapter_chromeos)
       ->DefaultAdapterChanged(new_adapter_path);
 
   // Adapter should have the new property value.
@@ -1511,7 +1513,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
   // 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));
 
@@ -1521,7 +1523,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
   // 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.discovering.ReplaceValue(true);
 
@@ -1543,11 +1545,11 @@ TEST_F(BluetoothAdapterChromeOsTest,
   BluetoothAdapterChromeOs* adapter_chromeos =
       static_cast<BluetoothAdapterChromeOs*>(adapter.get());
 
-  static_cast<BluetoothManagerClient::Observer*>(adapter_chromeos)
+  static_cast<chromeos::BluetoothManagerClient::Observer*>(adapter_chromeos)
       ->AdapterRemoved(adapter_path);
 
   // Adapter should have the new property value.
   EXPECT_FALSE(adapter->IsDiscovering());
 }
 
-}  // namespace chromeos
+}  // namespace bluetooth