Bluetooth: drop "Experimental" from Chrome OS backend

BUG=221813
TEST=device_unittests

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

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

1 files changed, 10 insertions, 15 deletions

diff --git a/chromeos/dbus/dbus_thread_manager.h b/chromeos/dbus/dbus_thread_manager.h
index 89f23b6..a46ee64 100644
--- a/chromeos/dbus/dbus_thread_manager.h
+++ b/chromeos/dbus/dbus_thread_manager.h
@@ -26,15 +26,15 @@ namespace chromeos {
 class DBusThreadManagerObserver;
 
 // Style Note: Clients are sorted by names.
+class BluetoothAdapterClient;
+class BluetoothAgentManagerClient;
+class BluetoothDeviceClient;
+class BluetoothInputClient;
+class BluetoothProfileManagerClient;
 class CrasAudioClient;
 class CrosDisksClient;
 class CryptohomeClient;
 class DebugDaemonClient;
-class ExperimentalBluetoothAdapterClient;
-class ExperimentalBluetoothAgentManagerClient;
-class ExperimentalBluetoothDeviceClient;
-class ExperimentalBluetoothInputClient;
-class ExperimentalBluetoothProfileManagerClient;
 class GsmSMSClient;
 class IBusClient;
 class IBusConfigClient;
@@ -120,20 +120,15 @@ class CHROMEOS_EXPORT DBusThreadManager {
 
   // All returned objects are owned by DBusThreadManager.  Do not cache these
   // pointers and use them after DBusThreadManager has been shut down.
+  virtual BluetoothAdapterClient* GetBluetoothAdapterClient() = 0;
+  virtual BluetoothAgentManagerClient* GetBluetoothAgentManagerClient() = 0;
+  virtual BluetoothDeviceClient* GetBluetoothDeviceClient() = 0;
+  virtual BluetoothInputClient* GetBluetoothInputClient() = 0;
+  virtual BluetoothProfileManagerClient* GetBluetoothProfileManagerClient() = 0;
   virtual CrasAudioClient* GetCrasAudioClient() = 0;
   virtual CrosDisksClient* GetCrosDisksClient() = 0;
   virtual CryptohomeClient* GetCryptohomeClient() = 0;
   virtual DebugDaemonClient* GetDebugDaemonClient() = 0;
-  virtual ExperimentalBluetoothAdapterClient*
-      GetExperimentalBluetoothAdapterClient() = 0;
-  virtual ExperimentalBluetoothAgentManagerClient*
-      GetExperimentalBluetoothAgentManagerClient() = 0;
-  virtual ExperimentalBluetoothDeviceClient*
-      GetExperimentalBluetoothDeviceClient() = 0;
-  virtual ExperimentalBluetoothInputClient*
-      GetExperimentalBluetoothInputClient() = 0;
-  virtual ExperimentalBluetoothProfileManagerClient*
-      GetExperimentalBluetoothProfileManagerClient() = 0;
   virtual GsmSMSClient* GetGsmSMSClient() = 0;
   virtual IBusClient* GetIBusClient() = 0;
   virtual IBusConfigClient* GetIBusConfigClient() = 0;