cros: Eliminate bluetooth methods from SystemTrayDelegate

ash/common/system/chromeos/bluetooth/tray_bluetooth_helper_unittest.cc

Index: ash/common/system/chromeos/bluetooth/tray_bluetooth_helper_unittest.cc
diff --git a/ash/common/system/chromeos/bluetooth/tray_bluetooth_helper_unittest.cc b/ash/common/system/chromeos/bluetooth/tray_bluetooth_helper_unittest.cc
index 77f4b662494429f5d73db9fd7fdb3b48a7c9cb87..01da12cd4285926a8450b2fb1255ec7a6863e428 100644
--- a/ash/common/system/chromeos/bluetooth/tray_bluetooth_helper_unittest.cc
+++ b/ash/common/system/chromeos/bluetooth/tray_bluetooth_helper_unittest.cc
@@ -31,35 +31,32 @@ TEST_F(TrayBluetoothHelperTest, Basics) {
   TrayBluetoothHelper helper;
   helper.Initialize();
   RunAllPendingInMessageLoop();
-  EXPECT_TRUE(helper.GetAvailable());
-  EXPECT_FALSE(helper.GetEnabled());
-  EXPECT_FALSE(helper.HasDiscoverySession());
-  EXPECT_FALSE(helper.IsDiscovering());
+  EXPECT_TRUE(helper.GetBluetoothAvailable());
+  EXPECT_FALSE(helper.GetBluetoothEnabled());
+  EXPECT_FALSE(helper.HasBluetoothDiscoverySession());
 
   std::vector<ash::BluetoothDeviceInfo> devices;
-  helper.GetAvailableDevices(&devices);
+  helper.GetAvailableBluetoothDevices(&devices);
   // The devices are fake in tests, so don't assume any particular number.
   EXPECT_FALSE(devices.empty());
 
   // Turn Bluetooth on.
-  helper.ToggleEnabled();
+  helper.ToggleBluetoothEnabled();
   RunAllPendingInMessageLoop();
-  EXPECT_TRUE(helper.GetEnabled());
+  EXPECT_TRUE(helper.GetBluetoothEnabled());
 
-  helper.StartDiscovering();
+  helper.StartBluetoothDiscovering();
   RunAllPendingInMessageLoop();
-  EXPECT_TRUE(helper.HasDiscoverySession());
-  EXPECT_TRUE(helper.IsDiscovering());
+  EXPECT_TRUE(helper.HasBluetoothDiscoverySession());
 
-  helper.StopDiscovering();
+  helper.StopBluetoothDiscovering();
   RunAllPendingInMessageLoop();
-  EXPECT_FALSE(helper.HasDiscoverySession());
-  EXPECT_FALSE(helper.IsDiscovering());
+  EXPECT_FALSE(helper.HasBluetoothDiscoverySession());
 
   // Turn Bluetooth off.
-  helper.ToggleEnabled();
+  helper.ToggleBluetoothEnabled();
   RunAllPendingInMessageLoop();
-  EXPECT_FALSE(helper.GetEnabled());
+  EXPECT_FALSE(helper.GetBluetoothEnabled());
 }
 
 }  // namespace