Bluetooth: clean up BluetoothDevice

device/bluetooth/bluetooth_adapter_chromeos_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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"
@@ skipping 112 matching lines @@
   MockBluetoothAdapter::Observer adapter_observer;
   adapter_->AddObserver(&adapter_observer);
 
   EXPECT_CALL(adapter_observer, AdapterPresentChanged(adapter_.get(), true))
       .Times(1);
 
   adapter_callback.Run(adapter_path, true);
 
   // Adapter should be present with the given address.
   EXPECT_TRUE(adapter_->IsPresent());
-  EXPECT_EQ(adapter_address, adapter_->address());
+  EXPECT_EQ(adapter_address, adapter_->GetAddress());
 }
 
 TEST_F(BluetoothAdapterChromeOSTest, DefaultAdapterWithoutAddress) {
   const dbus::ObjectPath adapter_path("/fake/hci0");
   const std::string adapter_address = "CA:FE:4A:C0:FE:FE";
 
   // Create the default adapter instance;
   // BluetoothManagerClient::DefaultAdapter will be called once, passing
   // a callback to obtain the adapter path.
   BluetoothManagerClient::AdapterCallback adapter_callback;
@@ skipping 34 matching lines @@
 
   BluetoothAdapterChromeOS* adapter_chromeos =
       static_cast<BluetoothAdapterChromeOS*>(adapter_.get());
 
   static_cast<BluetoothAdapterClient::Observer*>(adapter_chromeos)
       ->AdapterPropertyChanged(adapter_path,
                                adapter_properties.address.name());
 
   // Adapter should be present with the given address.
   EXPECT_TRUE(adapter_->IsPresent());
-  EXPECT_EQ(adapter_address, adapter_->address());
+  EXPECT_EQ(adapter_address, adapter_->GetAddress());
 }
 
 TEST_F(BluetoothAdapterChromeOSTest, DefaultAdapterBecomesPresentWithAddress) {
   const dbus::ObjectPath adapter_path("/fake/hci0");
   const std::string adapter_address = "CA:FE:4A:C0:FE:FE";
 
   // Create the default adapter instance;
   // BluetoothManagerClient::DefaultAdapter will be called once, passing
   // a callback to obtain the adapter path.
   BluetoothManagerClient::AdapterCallback adapter_callback;
@@ skipping 24 matching lines @@
       .Times(1);
 
   BluetoothAdapterChromeOS* adapter_chromeos =
       static_cast<BluetoothAdapterChromeOS*>(adapter_.get());
 
   static_cast<BluetoothManagerClient::Observer*>(adapter_chromeos)
       ->DefaultAdapterChanged(adapter_path);
 
   // Adapter should be present with the new address.
   EXPECT_TRUE(adapter_->IsPresent());
-  EXPECT_EQ(adapter_address, adapter_->address());
+  EXPECT_EQ(adapter_address, adapter_->GetAddress());
 }
 
 TEST_F(BluetoothAdapterChromeOSTest, DefaultAdapterReplacedWithAddress) {
   const dbus::ObjectPath initial_adapter_path("/fake/hci0");
   const dbus::ObjectPath new_adapter_path("/fake/hci1");
   const std::string initial_adapter_address = "CA:FE:4A:C0:FE:FE";
   const std::string new_adapter_address = "BA:C0:11:CO:FE:FE";
 
   // Create the default adapter instance;
   // BluetoothManagerClient::DefaultAdapter will be called once, passing
@@ skipping 38 matching lines @@
       .Times(1);
 
   BluetoothAdapterChromeOS* adapter_chromeos =
       static_cast<BluetoothAdapterChromeOS*>(adapter_.get());
 
   static_cast<BluetoothManagerClient::Observer*>(adapter_chromeos)
       ->DefaultAdapterChanged(new_adapter_path);
 
   // Adapter should be present with the new address.
   EXPECT_TRUE(adapter_->IsPresent());
-  EXPECT_EQ(new_adapter_address, adapter_->address());
+  EXPECT_EQ(new_adapter_address, adapter_->GetAddress());
 }
 
 TEST_F(BluetoothAdapterChromeOSTest,
        DefaultAdapterBecomesPresentWithoutAddress) {
   const dbus::ObjectPath adapter_path("/fake/hci0");
   const std::string adapter_address = "CA:FE:4A:C0:FE:FE";
 
   // Create the default adapter instance;
   // BluetoothManagerClient::DefaultAdapter will be called once, passing
   // a callback to obtain the adapter path.
@@ skipping 38 matching lines @@
 
   EXPECT_CALL(adapter_observer, AdapterPresentChanged(adapter_.get(), true))
       .Times(1);
 
   static_cast<BluetoothAdapterClient::Observer*>(adapter_chromeos)
       ->AdapterPropertyChanged(adapter_path,
                                adapter_properties.address.name());
 
   // Adapter should be present with the new address.
   EXPECT_TRUE(adapter_->IsPresent());
-  EXPECT_EQ(adapter_address, adapter_->address());
+  EXPECT_EQ(adapter_address, adapter_->GetAddress());
 }
 
 TEST_F(BluetoothAdapterChromeOSTest, DefaultAdapterReplacedWithoutAddress) {
   const dbus::ObjectPath initial_adapter_path("/fake/hci0");
   const dbus::ObjectPath new_adapter_path("/fake/hci1");
   const std::string initial_adapter_address = "CA:FE:4A:C0:FE:FE";
   const std::string new_adapter_address = "BA:C0:11:CO:FE:FE";
 
   // Create the default adapter instance;
   // BluetoothManagerClient::DefaultAdapter will be called once, passing
@@ skipping 48 matching lines @@
 
   EXPECT_CALL(adapter_observer, AdapterPresentChanged(adapter_.get(), true))
       .Times(1);
 
   static_cast<BluetoothAdapterClient::Observer*>(adapter_chromeos)
       ->AdapterPropertyChanged(new_adapter_path,
                                new_adapter_properties.address.name());
 
   // Adapter should be present with the new address.
   EXPECT_TRUE(adapter_->IsPresent());
-  EXPECT_EQ(new_adapter_address, adapter_->address());
+  EXPECT_EQ(new_adapter_address, adapter_->GetAddress());
 }
 
 TEST_F(BluetoothAdapterChromeOSTest, DefaultAdapterRemoved) {
   const dbus::ObjectPath adapter_path("/fake/hci0");
   const std::string adapter_address = "CA:FE:4A:C0:FE:FE";
 
   // Create the default adapter instance;
   // BluetoothManagerClient::DefaultAdapter will be called once, passing
   // a callback to obtain the adapter path.
   BluetoothManagerClient::AdapterCallback adapter_callback;
@@ skipping 1786 matching lines @@
                  base::Unretained(this)));
 
   // Return to indicate success.
   stop_discovery_callback.Run(adapter_path, true);
 
   EXPECT_TRUE(callback_called_);
   EXPECT_FALSE(error_callback_called_);
 }
 
 }  // namespace chromeos