Bluetooth: rename TrackDefaultAdapter to Init

This makes more sense since Init() makes IsInitialized() return true;
remove the method entirely from the implementations where it makes no
sense.

Rename TrackTestAdapter() to InitForTest() to match on the win and mac
implementations.

BUG=none
TEST=device_unittests


Review URL: https://chromiumcodereview.appspot.com/13214002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191925 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 2 insertions, 4 deletions

diff --git a/device/bluetooth/bluetooth_adapter_factory.cc b/device/bluetooth/bluetooth_adapter_factory.cc
index 107185a..211cef9 100644
--- a/device/bluetooth/bluetooth_adapter_factory.cc
+++ b/device/bluetooth/bluetooth_adapter_factory.cc
@@ -81,22 +81,20 @@ void BluetoothAdapterFactory::GetAdapter(const AdapterCallback& callback) {
         chromeos::switches::kEnableExperimentalBluetooth)) {
       chromeos::BluetoothAdapterChromeOSExperimental* new_adapter =
           new chromeos::BluetoothAdapterChromeOSExperimental;
-      new_adapter->TrackDefaultAdapter();
       default_adapter.Get() = new_adapter->weak_ptr_factory_.GetWeakPtr();
     } else {
       chromeos::BluetoothAdapterChromeOS* new_adapter =
           new chromeos::BluetoothAdapterChromeOS;
-      new_adapter->TrackDefaultAdapter();
       default_adapter.Get() = new_adapter->weak_ptr_factory_.GetWeakPtr();
     }
 #elif defined(OS_WIN)
     BluetoothAdapterWin* new_adapter = new BluetoothAdapterWin(
         base::Bind(&RunAdapterCallbacks));
-    new_adapter->TrackDefaultAdapter();
+    new_adapter->Init();
     default_adapter.Get() = new_adapter->weak_ptr_factory_.GetWeakPtr();
 #elif defined(OS_MACOSX)
     BluetoothAdapterMac* new_adapter = new BluetoothAdapterMac();
-    new_adapter->TrackDefaultAdapter();
+    new_adapter->Init();
     default_adapter.Get() = new_adapter->weak_ptr_factory_.GetWeakPtr();
 #endif
   }