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

33 files changed, 551 insertions, 654 deletions

diff --git a/chromeos/chromeos.gyp b/chromeos/chromeos.gyp
index 6270b34..eb3d36a 100644
--- a/chromeos/chromeos.gyp
+++ b/chromeos/chromeos.gyp
@@ -62,6 +62,20 @@
         'dbus/audio_node.h',
         'dbus/blocking_method_caller.cc',
         'dbus/blocking_method_caller.h',
+        'dbus/bluetooth_adapter_client.cc',
+        'dbus/bluetooth_adapter_client.h',
+        'dbus/bluetooth_agent_manager_client.cc',
+        'dbus/bluetooth_agent_manager_client.h',
+        'dbus/bluetooth_agent_service_provider.cc',
+        'dbus/bluetooth_agent_service_provider.h',
+        'dbus/bluetooth_device_client.cc',
+        'dbus/bluetooth_device_client.h',
+        'dbus/bluetooth_input_client.cc',
+        'dbus/bluetooth_input_client.h',
+        'dbus/bluetooth_profile_manager_client.cc',
+        'dbus/bluetooth_profile_manager_client.h',
+        'dbus/bluetooth_profile_service_provider.cc',
+        'dbus/bluetooth_profile_service_provider.h',
         'dbus/cras_audio_client.cc',
         'dbus/cras_audio_client.h',
         'dbus/cros_disks_client.cc',
@@ -74,20 +88,6 @@
         'dbus/dbus_thread_manager.h',
         'dbus/debug_daemon_client.cc',
         'dbus/debug_daemon_client.h',
-        'dbus/experimental_bluetooth_adapter_client.cc',
-        'dbus/experimental_bluetooth_adapter_client.h',
-        'dbus/experimental_bluetooth_agent_manager_client.cc',
-        'dbus/experimental_bluetooth_agent_manager_client.h',
-        'dbus/experimental_bluetooth_agent_service_provider.cc',
-        'dbus/experimental_bluetooth_agent_service_provider.h',
-        'dbus/experimental_bluetooth_device_client.cc',
-        'dbus/experimental_bluetooth_device_client.h',
-        'dbus/experimental_bluetooth_input_client.cc',
-        'dbus/experimental_bluetooth_input_client.h',
-        'dbus/experimental_bluetooth_profile_manager_client.cc',
-        'dbus/experimental_bluetooth_profile_manager_client.h',
-        'dbus/experimental_bluetooth_profile_service_provider.cc',
-        'dbus/experimental_bluetooth_profile_service_provider.h',
         'dbus/fake_bluetooth_adapter_client.cc',
         'dbus/fake_bluetooth_adapter_client.h',
         'dbus/fake_bluetooth_agent_manager_client.cc',
diff --git a/chromeos/dbus/experimental_bluetooth_adapter_client.cc b/chromeos/dbus/bluetooth_adapter_client.cc
index 9c6ac50..c822e3a 100644
--- a/chromeos/dbus/experimental_bluetooth_adapter_client.cc
+++ b/chromeos/dbus/bluetooth_adapter_client.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Copyright 2013 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/experimental_bluetooth_adapter_client.h"
+#include "chromeos/dbus/bluetooth_adapter_client.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ -16,12 +16,12 @@
 
 namespace chromeos {
 
-const char ExperimentalBluetoothAdapterClient::kNoResponseError[] =
+const char BluetoothAdapterClient::kNoResponseError[] =
     "org.chromium.Error.NoResponse";
-const char ExperimentalBluetoothAdapterClient::kUnknownAdapterError[] =
+const char BluetoothAdapterClient::kUnknownAdapterError[] =
     "org.chromium.Error.UnknownAdapter";
 
-ExperimentalBluetoothAdapterClient::Properties::Properties(
+BluetoothAdapterClient::Properties::Properties(
     dbus::ObjectProxy* object_proxy,
     const std::string& interface_name,
     const PropertyChangedCallback& callback)
@@ -42,16 +42,16 @@ ExperimentalBluetoothAdapterClient::Properties::Properties(
   RegisterProperty(bluetooth_adapter::kModaliasProperty, &modalias);
 }
 
-ExperimentalBluetoothAdapterClient::Properties::~Properties() {
+BluetoothAdapterClient::Properties::~Properties() {
 }
 
 
-// The ExperimentalBluetoothAdapterClient implementation used in production.
-class ExperimentalBluetoothAdapterClientImpl
-    : public ExperimentalBluetoothAdapterClient,
+// The BluetoothAdapterClient implementation used in production.
+class BluetoothAdapterClientImpl
+    : public BluetoothAdapterClient,
       public dbus::ObjectManager::Interface {
  public:
-  explicit ExperimentalBluetoothAdapterClientImpl(dbus::Bus* bus)
+  explicit BluetoothAdapterClientImpl(dbus::Bus* bus)
       : bus_(bus),
         weak_ptr_factory_(this) {
     object_manager_ = bus_->GetObjectManager(
@@ -62,21 +62,21 @@ class ExperimentalBluetoothAdapterClientImpl
         bluetooth_adapter::kBluetoothAdapterInterface, this);
   }
 
-  virtual ~ExperimentalBluetoothAdapterClientImpl() {
+  virtual ~BluetoothAdapterClientImpl() {
     object_manager_->UnregisterInterface(
         bluetooth_adapter::kBluetoothAdapterInterface);
   }
 
-  // ExperimentalBluetoothAdapterClient override.
-  virtual void AddObserver(
-      ExperimentalBluetoothAdapterClient::Observer* observer) OVERRIDE {
+  // BluetoothAdapterClient override.
+  virtual void AddObserver(BluetoothAdapterClient::Observer* observer)
+      OVERRIDE {
     DCHECK(observer);
     observers_.AddObserver(observer);
   }
 
-  // ExperimentalBluetoothAdapterClient override.
-  virtual void RemoveObserver(
-      ExperimentalBluetoothAdapterClient::Observer* observer) OVERRIDE {
+  // BluetoothAdapterClient override.
+  virtual void RemoveObserver(BluetoothAdapterClient::Observer* observer)
+      OVERRIDE {
     DCHECK(observer);
     observers_.RemoveObserver(observer);
   }
@@ -95,13 +95,13 @@ class ExperimentalBluetoothAdapterClientImpl
     Properties* properties = new Properties(
         object_proxy,
         interface_name,
-        base::Bind(&ExperimentalBluetoothAdapterClientImpl::OnPropertyChanged,
+        base::Bind(&BluetoothAdapterClientImpl::OnPropertyChanged,
                    weak_ptr_factory_.GetWeakPtr(),
                    object_path));
     return static_cast<dbus::PropertySet*>(properties);
   }
 
-  // ExperimentalBluetoothAdapterClient override.
+  // BluetoothAdapterClient override.
   virtual Properties* GetProperties(const dbus::ObjectPath& object_path)
       OVERRIDE {
     return static_cast<Properties*>(
@@ -110,7 +110,7 @@ class ExperimentalBluetoothAdapterClientImpl
             bluetooth_adapter::kBluetoothAdapterInterface));
   }
 
-  // ExperimentalBluetoothAdapterClient override.
+  // BluetoothAdapterClient override.
   virtual void StartDiscovery(const dbus::ObjectPath& object_path,
                               const base::Closure& callback,
                               const ErrorCallback& error_callback) OVERRIDE {
@@ -128,13 +128,13 @@ class ExperimentalBluetoothAdapterClientImpl
     object_proxy->CallMethodWithErrorCallback(
         &method_call,
         dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
-        base::Bind(&ExperimentalBluetoothAdapterClientImpl::OnSuccess,
+        base::Bind(&BluetoothAdapterClientImpl::OnSuccess,
                    weak_ptr_factory_.GetWeakPtr(), callback),
-        base::Bind(&ExperimentalBluetoothAdapterClientImpl::OnError,
+        base::Bind(&BluetoothAdapterClientImpl::OnError,
                    weak_ptr_factory_.GetWeakPtr(), error_callback));
   }
 
-  // ExperimentalBluetoothAdapterClient override.
+  // BluetoothAdapterClient override.
   virtual void StopDiscovery(const dbus::ObjectPath& object_path,
                              const base::Closure& callback,
                              const ErrorCallback& error_callback) OVERRIDE {
@@ -152,13 +152,13 @@ class ExperimentalBluetoothAdapterClientImpl
     object_proxy->CallMethodWithErrorCallback(
         &method_call,
         dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
-        base::Bind(&ExperimentalBluetoothAdapterClientImpl::OnSuccess,
+        base::Bind(&BluetoothAdapterClientImpl::OnSuccess,
                    weak_ptr_factory_.GetWeakPtr(), callback),
-        base::Bind(&ExperimentalBluetoothAdapterClientImpl::OnError,
+        base::Bind(&BluetoothAdapterClientImpl::OnError,
                    weak_ptr_factory_.GetWeakPtr(), error_callback));
   }
 
-  // ExperimentalBluetoothAdapterClient override.
+  // BluetoothAdapterClient override.
   virtual void RemoveDevice(const dbus::ObjectPath& object_path,
                             const dbus::ObjectPath& device_path,
                             const base::Closure& callback,
@@ -180,9 +180,9 @@ class ExperimentalBluetoothAdapterClientImpl
     object_proxy->CallMethodWithErrorCallback(
         &method_call,
         dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
-        base::Bind(&ExperimentalBluetoothAdapterClientImpl::OnSuccess,
+        base::Bind(&BluetoothAdapterClientImpl::OnSuccess,
                    weak_ptr_factory_.GetWeakPtr(), callback),
-        base::Bind(&ExperimentalBluetoothAdapterClientImpl::OnError,
+        base::Bind(&BluetoothAdapterClientImpl::OnError,
                    weak_ptr_factory_.GetWeakPtr(), error_callback));
   }
 
@@ -191,8 +191,7 @@ class ExperimentalBluetoothAdapterClientImpl
   // is created. Informs observers.
   virtual void ObjectAdded(const dbus::ObjectPath& object_path,
                            const std::string& interface_name) OVERRIDE {
-    FOR_EACH_OBSERVER(ExperimentalBluetoothAdapterClient::Observer,
-                      observers_,
+    FOR_EACH_OBSERVER(BluetoothAdapterClient::Observer, observers_,
                       AdapterAdded(object_path));
   }
 
@@ -200,8 +199,7 @@ class ExperimentalBluetoothAdapterClientImpl
   // is removed. Informs observers.
   virtual void ObjectRemoved(const dbus::ObjectPath& object_path,
                              const std::string& interface_name) OVERRIDE {
-    FOR_EACH_OBSERVER(ExperimentalBluetoothAdapterClient::Observer,
-                      observers_,
+    FOR_EACH_OBSERVER(BluetoothAdapterClient::Observer, observers_,
                       AdapterRemoved(object_path));
   }
 
@@ -210,7 +208,7 @@ class ExperimentalBluetoothAdapterClientImpl
   // call. Informs observers.
   void OnPropertyChanged(const dbus::ObjectPath& object_path,
                          const std::string& property_name) {
-    FOR_EACH_OBSERVER(ExperimentalBluetoothAdapterClient::Observer, observers_,
+    FOR_EACH_OBSERVER(BluetoothAdapterClient::Observer, observers_,
                       AdapterPropertyChanged(object_path, property_name));
   }
 
@@ -242,29 +240,29 @@ class ExperimentalBluetoothAdapterClientImpl
   dbus::ObjectManager* object_manager_;
 
   // List of observers interested in event notifications from us.
-  ObserverList<ExperimentalBluetoothAdapterClient::Observer> observers_;
+  ObserverList<BluetoothAdapterClient::Observer> observers_;
 
   // Weak pointer factory for generating 'this' pointers that might live longer
   // than we do.
   // Note: This should remain the last member so it'll be destroyed and
   // invalidate its weak pointers before any other members are destroyed.
-  base::WeakPtrFactory<ExperimentalBluetoothAdapterClientImpl>
+  base::WeakPtrFactory<BluetoothAdapterClientImpl>
       weak_ptr_factory_;
 
-  DISALLOW_COPY_AND_ASSIGN(ExperimentalBluetoothAdapterClientImpl);
+  DISALLOW_COPY_AND_ASSIGN(BluetoothAdapterClientImpl);
 };
 
-ExperimentalBluetoothAdapterClient::ExperimentalBluetoothAdapterClient() {
+BluetoothAdapterClient::BluetoothAdapterClient() {
 }
 
-ExperimentalBluetoothAdapterClient::~ExperimentalBluetoothAdapterClient() {
+BluetoothAdapterClient::~BluetoothAdapterClient() {
 }
 
-ExperimentalBluetoothAdapterClient* ExperimentalBluetoothAdapterClient::Create(
+BluetoothAdapterClient* BluetoothAdapterClient::Create(
     DBusClientImplementationType type,
     dbus::Bus* bus) {
   if (type == REAL_DBUS_CLIENT_IMPLEMENTATION)
-    return new ExperimentalBluetoothAdapterClientImpl(bus);
+    return new BluetoothAdapterClientImpl(bus);
   DCHECK_EQ(STUB_DBUS_CLIENT_IMPLEMENTATION, type);
   return new FakeBluetoothAdapterClient();
 }
diff --git a/chromeos/dbus/experimental_bluetooth_adapter_client.h b/chromeos/dbus/bluetooth_adapter_client.h
index 19c1382..60eaff8 100644
--- a/chromeos/dbus/experimental_bluetooth_adapter_client.h
+++ b/chromeos/dbus/bluetooth_adapter_client.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Copyright 2013 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.
 
-#ifndef CHROMEOS_DBUS_EXPERIMENTAL_BLUETOOTH_ADAPTER_CLIENT_H_
-#define CHROMEOS_DBUS_EXPERIMENTAL_BLUETOOTH_ADAPTER_CLIENT_H_
+#ifndef CHROMEOS_DBUS_BLUETOOTH_ADAPTER_CLIENT_H_
+#define CHROMEOS_DBUS_BLUETOOTH_ADAPTER_CLIENT_H_
 
 #include <string>
 #include <vector>
@@ -22,9 +22,9 @@ class Bus;
 
 namespace chromeos {
 
-// ExperimentalBluetoothAdapterClient is used to communicate with Bluetooth
-// Adapter objects.
-class CHROMEOS_EXPORT ExperimentalBluetoothAdapterClient {
+// BluetoothAdapterClient is used to communicate with objects representing
+// local Bluetooth Adapters.
+class CHROMEOS_EXPORT BluetoothAdapterClient {
  public:
   // Structure of properties associated with bluetooth adapters.
   struct Properties : public dbus::PropertySet {
@@ -101,7 +101,7 @@ class CHROMEOS_EXPORT ExperimentalBluetoothAdapterClient {
                                         const std::string& property_name) {}
   };
 
-  virtual ~ExperimentalBluetoothAdapterClient();
+  virtual ~BluetoothAdapterClient();
 
   // Adds and removes observers for events on all local bluetooth
   // adapters. Check the |object_path| parameter of observer methods to
@@ -142,21 +142,20 @@ class CHROMEOS_EXPORT ExperimentalBluetoothAdapterClient {
                             const ErrorCallback& error_callback) = 0;
 
   // Creates the instance.
-  static ExperimentalBluetoothAdapterClient* Create(
-      DBusClientImplementationType type,
-      dbus::Bus* bus);
+  static BluetoothAdapterClient* Create(DBusClientImplementationType type,
+                                        dbus::Bus* bus);
 
   // Constants used to indicate exceptional error conditions.
   static const char kNoResponseError[];
   static const char kUnknownAdapterError[];
 
  protected:
-  ExperimentalBluetoothAdapterClient();
+  BluetoothAdapterClient();
 
  private:
-  DISALLOW_COPY_AND_ASSIGN(ExperimentalBluetoothAdapterClient);
+  DISALLOW_COPY_AND_ASSIGN(BluetoothAdapterClient);
 };
 
 }  // namespace chromeos
 
-#endif  // CHROMEOS_DBUS_EXPERIMENTAL_BLUETOOTH_ADAPTER_CLIENT_H_
+#endif  // CHROMEOS_DBUS_BLUETOOTH_ADAPTER_CLIENT_H_
diff --git a/chromeos/dbus/experimental_bluetooth_agent_manager_client.cc b/chromeos/dbus/bluetooth_agent_manager_client.cc
index 177bc31..7f96406 100644
--- a/chromeos/dbus/experimental_bluetooth_agent_manager_client.cc
+++ b/chromeos/dbus/bluetooth_agent_manager_client.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Copyright 2013 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/experimental_bluetooth_agent_manager_client.h"
+#include "chromeos/dbus/bluetooth_agent_manager_client.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ -15,15 +15,14 @@
 
 namespace chromeos {
 
-const char ExperimentalBluetoothAgentManagerClient::kNoResponseError[] =
+const char BluetoothAgentManagerClient::kNoResponseError[] =
     "org.chromium.Error.NoResponse";
 
-// The ExperimentalBluetoothAgentManagerClient implementation used in
-// production.
-class ExperimentalBluetoothAgentManagerClientImpl
-    : public ExperimentalBluetoothAgentManagerClient {
+// The BluetoothAgentManagerClient implementation used in production.
+class BluetoothAgentManagerClientImpl
+    : public BluetoothAgentManagerClient {
  public:
-  explicit ExperimentalBluetoothAgentManagerClientImpl(dbus::Bus* bus)
+  explicit BluetoothAgentManagerClientImpl(dbus::Bus* bus)
       : bus_(bus),
         weak_ptr_factory_(this) {
     DCHECK(bus_);
@@ -33,10 +32,10 @@ class ExperimentalBluetoothAgentManagerClientImpl
             bluetooth_agent_manager::kBluetoothAgentManagerServicePath));
   }
 
-  virtual ~ExperimentalBluetoothAgentManagerClientImpl() {
+  virtual ~BluetoothAgentManagerClientImpl() {
   }
 
-  // ExperimentalBluetoothAgentManagerClient override.
+  // BluetoothAgentManagerClient override.
   virtual void RegisterAgent(const dbus::ObjectPath& agent_path,
                              const std::string& capability,
                              const base::Closure& callback,
@@ -52,13 +51,13 @@ class ExperimentalBluetoothAgentManagerClientImpl
     object_proxy_->CallMethodWithErrorCallback(
         &method_call,
         dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
-        base::Bind(&ExperimentalBluetoothAgentManagerClientImpl::OnSuccess,
+        base::Bind(&BluetoothAgentManagerClientImpl::OnSuccess,
                    weak_ptr_factory_.GetWeakPtr(), callback),
-        base::Bind(&ExperimentalBluetoothAgentManagerClientImpl::OnError,
+        base::Bind(&BluetoothAgentManagerClientImpl::OnError,
                    weak_ptr_factory_.GetWeakPtr(), error_callback));
   }
 
-  // ExperimentalBluetoothAgentManagerClient override.
+  // BluetoothAgentManagerClient override.
   virtual void UnregisterAgent(const dbus::ObjectPath& agent_path,
                                const base::Closure& callback,
                                const ErrorCallback& error_callback) OVERRIDE {
@@ -72,14 +71,14 @@ class ExperimentalBluetoothAgentManagerClientImpl
     object_proxy_->CallMethodWithErrorCallback(
         &method_call,
         dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
-        base::Bind(&ExperimentalBluetoothAgentManagerClientImpl::OnSuccess,
+        base::Bind(&BluetoothAgentManagerClientImpl::OnSuccess,
                    weak_ptr_factory_.GetWeakPtr(), callback),
-        base::Bind(&ExperimentalBluetoothAgentManagerClientImpl::OnError,
+        base::Bind(&BluetoothAgentManagerClientImpl::OnError,
                    weak_ptr_factory_.GetWeakPtr(), error_callback));
   }
 
 
-  // ExperimentalBluetoothAgentManagerClient override.
+  // BluetoothAgentManagerClient override.
   virtual void RequestDefaultAgent(const dbus::ObjectPath& agent_path,
                                    const base::Closure& callback,
                                    const ErrorCallback& error_callback)
@@ -94,9 +93,9 @@ class ExperimentalBluetoothAgentManagerClientImpl
     object_proxy_->CallMethodWithErrorCallback(
         &method_call,
         dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
-        base::Bind(&ExperimentalBluetoothAgentManagerClientImpl::OnSuccess,
+        base::Bind(&BluetoothAgentManagerClientImpl::OnSuccess,
                    weak_ptr_factory_.GetWeakPtr(), callback),
-        base::Bind(&ExperimentalBluetoothAgentManagerClientImpl::OnError,
+        base::Bind(&BluetoothAgentManagerClientImpl::OnError,
                    weak_ptr_factory_.GetWeakPtr(), error_callback));
   }
 
@@ -132,26 +131,23 @@ class ExperimentalBluetoothAgentManagerClientImpl
   // than we do.
   // Note: This should remain the last member so it'll be destroyed and
   // invalidate its weak pointers before any other members are destroyed.
-  base::WeakPtrFactory<ExperimentalBluetoothAgentManagerClientImpl>
+  base::WeakPtrFactory<BluetoothAgentManagerClientImpl>
       weak_ptr_factory_;
 
-  DISALLOW_COPY_AND_ASSIGN(ExperimentalBluetoothAgentManagerClientImpl);
+  DISALLOW_COPY_AND_ASSIGN(BluetoothAgentManagerClientImpl);
 };
 
-ExperimentalBluetoothAgentManagerClient::
-    ExperimentalBluetoothAgentManagerClient() {
+BluetoothAgentManagerClient::BluetoothAgentManagerClient() {
 }
 
-ExperimentalBluetoothAgentManagerClient::
-    ~ExperimentalBluetoothAgentManagerClient() {
+BluetoothAgentManagerClient::~BluetoothAgentManagerClient() {
 }
 
-ExperimentalBluetoothAgentManagerClient*
-    ExperimentalBluetoothAgentManagerClient::Create(
-        DBusClientImplementationType type,
-        dbus::Bus* bus) {
+BluetoothAgentManagerClient* BluetoothAgentManagerClient::Create(
+    DBusClientImplementationType type,
+    dbus::Bus* bus) {
   if (type == REAL_DBUS_CLIENT_IMPLEMENTATION)
-    return new ExperimentalBluetoothAgentManagerClientImpl(bus);
+    return new BluetoothAgentManagerClientImpl(bus);
   DCHECK_EQ(STUB_DBUS_CLIENT_IMPLEMENTATION, type);
   return new FakeBluetoothAgentManagerClient();
 }
diff --git a/chromeos/dbus/experimental_bluetooth_agent_manager_client.h b/chromeos/dbus/bluetooth_agent_manager_client.h
index bf71959..acf0465 100644
--- a/chromeos/dbus/experimental_bluetooth_agent_manager_client.h
+++ b/chromeos/dbus/bluetooth_agent_manager_client.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Copyright 2013 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.
 
-#ifndef CHROMEOS_DBUS_EXPERIMENTAL_BLUETOOTH_AGENT_MANAGER_CLIENT_H_
-#define CHROMEOS_DBUS_EXPERIMENTAL_BLUETOOTH_AGENT_MANAGER_CLIENT_H_
+#ifndef CHROMEOS_DBUS_BLUETOOTH_AGENT_MANAGER_CLIENT_H_
+#define CHROMEOS_DBUS_BLUETOOTH_AGENT_MANAGER_CLIENT_H_
 
 #include <string>
 #include <vector>
@@ -20,11 +20,11 @@ class Bus;
 
 namespace chromeos {
 
-// ExperimentalBluetoothAgentManagerClient is used to communicate with the
-// agent manager component of the Bluetooth daemon.
-class CHROMEOS_EXPORT ExperimentalBluetoothAgentManagerClient {
+// BluetoothAgentManagerClient is used to communicate with the agent manager
+// object of the Bluetooth daemon.
+class CHROMEOS_EXPORT BluetoothAgentManagerClient {
  public:
-  virtual ~ExperimentalBluetoothAgentManagerClient();
+  virtual ~BluetoothAgentManagerClient();
 
   // The ErrorCallback is used by agent manager methods to indicate failure.
   // It receives two arguments: the name of the error in |error_name| and
@@ -55,20 +55,19 @@ class CHROMEOS_EXPORT ExperimentalBluetoothAgentManagerClient {
                                    const ErrorCallback& error_callback) = 0;
 
  // Creates the instance.
-  static ExperimentalBluetoothAgentManagerClient* Create(
-      DBusClientImplementationType type,
-      dbus::Bus* bus);
+  static BluetoothAgentManagerClient* Create(DBusClientImplementationType type,
+                                             dbus::Bus* bus);
 
   // Constants used to indicate exceptional error conditions.
   static const char kNoResponseError[];
 
  protected:
-  ExperimentalBluetoothAgentManagerClient();
+  BluetoothAgentManagerClient();
 
  private:
-  DISALLOW_COPY_AND_ASSIGN(ExperimentalBluetoothAgentManagerClient);
+  DISALLOW_COPY_AND_ASSIGN(BluetoothAgentManagerClient);
 };
 
 }  // namespace chromeos
 
-#endif  // CHROMEOS_DBUS_EXPERIMENTAL_BLUETOOTH_AGENT_MANAGER_CLIENT_H_
+#endif  // CHROMEOS_DBUS_BLUETOOTH_AGENT_MANAGER_CLIENT_H_
diff --git a/chromeos/dbus/experimental_bluetooth_agent_service_provider.cc b/chromeos/dbus/bluetooth_agent_service_provider.cc
index 7ee4580..ece8096 100644
--- a/chromeos/dbus/experimental_bluetooth_agent_service_provider.cc
+++ b/chromeos/dbus/bluetooth_agent_service_provider.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Copyright 2013 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/experimental_bluetooth_agent_service_provider.h"
+#include "chromeos/dbus/bluetooth_agent_service_provider.h"
 
 #include <string>
 
@@ -20,15 +20,13 @@
 
 namespace chromeos {
 
-// The ExperimentalBluetoothAgentServiceProvider implementation used in
-// production.
-class ExperimentalBluetoothAgentServiceProviderImpl
-    : public ExperimentalBluetoothAgentServiceProvider {
+// The BluetoothAgentServiceProvider implementation used in production.
+class BluetoothAgentServiceProviderImpl
+    : public BluetoothAgentServiceProvider {
  public:
-  ExperimentalBluetoothAgentServiceProviderImpl(
-      dbus::Bus* bus,
-      const dbus::ObjectPath& object_path,
-      Delegate* delegate)
+  BluetoothAgentServiceProviderImpl(dbus::Bus* bus,
+                                    const dbus::ObjectPath& object_path,
+                                    Delegate* delegate)
       : origin_thread_id_(base::PlatformThread::CurrentId()),
         bus_(bus),
         delegate_(delegate),
@@ -41,95 +39,77 @@ class ExperimentalBluetoothAgentServiceProviderImpl
     exported_object_->ExportMethod(
         bluetooth_agent::kBluetoothAgentInterface,
         bluetooth_agent::kRelease,
-        base::Bind(
-            &ExperimentalBluetoothAgentServiceProviderImpl::Release,
-            weak_ptr_factory_.GetWeakPtr()),
-        base::Bind(
-            &ExperimentalBluetoothAgentServiceProviderImpl::OnExported,
-            weak_ptr_factory_.GetWeakPtr()));
+        base::Bind(&BluetoothAgentServiceProviderImpl::Release,
+                   weak_ptr_factory_.GetWeakPtr()),
+        base::Bind(&BluetoothAgentServiceProviderImpl::OnExported,
+                   weak_ptr_factory_.GetWeakPtr()));
 
     exported_object_->ExportMethod(
         bluetooth_agent::kBluetoothAgentInterface,
         bluetooth_agent::kRequestPinCode,
-        base::Bind(
-            &ExperimentalBluetoothAgentServiceProviderImpl::RequestPinCode,
-            weak_ptr_factory_.GetWeakPtr()),
-        base::Bind(
-            &ExperimentalBluetoothAgentServiceProviderImpl::OnExported,
-            weak_ptr_factory_.GetWeakPtr()));
+        base::Bind(&BluetoothAgentServiceProviderImpl::RequestPinCode,
+                   weak_ptr_factory_.GetWeakPtr()),
+        base::Bind(&BluetoothAgentServiceProviderImpl::OnExported,
+                   weak_ptr_factory_.GetWeakPtr()));
 
     exported_object_->ExportMethod(
         bluetooth_agent::kBluetoothAgentInterface,
         bluetooth_agent::kDisplayPinCode,
-        base::Bind(
-            &ExperimentalBluetoothAgentServiceProviderImpl::DisplayPinCode,
-            weak_ptr_factory_.GetWeakPtr()),
-        base::Bind(
-            &ExperimentalBluetoothAgentServiceProviderImpl::OnExported,
-            weak_ptr_factory_.GetWeakPtr()));
+        base::Bind(&BluetoothAgentServiceProviderImpl::DisplayPinCode,
+                   weak_ptr_factory_.GetWeakPtr()),
+        base::Bind(&BluetoothAgentServiceProviderImpl::OnExported,
+                   weak_ptr_factory_.GetWeakPtr()));
 
     exported_object_->ExportMethod(
         bluetooth_agent::kBluetoothAgentInterface,
         bluetooth_agent::kRequestPasskey,
-        base::Bind(
-            &ExperimentalBluetoothAgentServiceProviderImpl::RequestPasskey,
-            weak_ptr_factory_.GetWeakPtr()),
-        base::Bind(
-            &ExperimentalBluetoothAgentServiceProviderImpl::OnExported,
-            weak_ptr_factory_.GetWeakPtr()));
+        base::Bind(&BluetoothAgentServiceProviderImpl::RequestPasskey,
+                   weak_ptr_factory_.GetWeakPtr()),
+        base::Bind(&BluetoothAgentServiceProviderImpl::OnExported,
+                   weak_ptr_factory_.GetWeakPtr()));
 
     exported_object_->ExportMethod(
         bluetooth_agent::kBluetoothAgentInterface,
         bluetooth_agent::kDisplayPasskey,
-        base::Bind(
-            &ExperimentalBluetoothAgentServiceProviderImpl::DisplayPasskey,
-            weak_ptr_factory_.GetWeakPtr()),
-        base::Bind(
-            &ExperimentalBluetoothAgentServiceProviderImpl::OnExported,
-            weak_ptr_factory_.GetWeakPtr()));
+        base::Bind(&BluetoothAgentServiceProviderImpl::DisplayPasskey,
+                   weak_ptr_factory_.GetWeakPtr()),
+        base::Bind(&BluetoothAgentServiceProviderImpl::OnExported,
+                   weak_ptr_factory_.GetWeakPtr()));
 
     exported_object_->ExportMethod(
         bluetooth_agent::kBluetoothAgentInterface,
         bluetooth_agent::kRequestConfirmation,
-        base::Bind(
-            &ExperimentalBluetoothAgentServiceProviderImpl::RequestConfirmation,
-            weak_ptr_factory_.GetWeakPtr()),
-        base::Bind(
-            &ExperimentalBluetoothAgentServiceProviderImpl::OnExported,
-            weak_ptr_factory_.GetWeakPtr()));
+        base::Bind(&BluetoothAgentServiceProviderImpl::RequestConfirmation,
+                   weak_ptr_factory_.GetWeakPtr()),
+        base::Bind(&BluetoothAgentServiceProviderImpl::OnExported,
+                   weak_ptr_factory_.GetWeakPtr()));
 
     exported_object_->ExportMethod(
         bluetooth_agent::kBluetoothAgentInterface,
         bluetooth_agent::kRequestAuthorization,
-        base::Bind(
-           &ExperimentalBluetoothAgentServiceProviderImpl::RequestAuthorization,
-            weak_ptr_factory_.GetWeakPtr()),
-        base::Bind(
-            &ExperimentalBluetoothAgentServiceProviderImpl::OnExported,
-            weak_ptr_factory_.GetWeakPtr()));
+        base::Bind(&BluetoothAgentServiceProviderImpl::RequestAuthorization,
+                   weak_ptr_factory_.GetWeakPtr()),
+        base::Bind(&BluetoothAgentServiceProviderImpl::OnExported,
+                   weak_ptr_factory_.GetWeakPtr()));
 
     exported_object_->ExportMethod(
         bluetooth_agent::kBluetoothAgentInterface,
         bluetooth_agent::kAuthorizeService,
-        base::Bind(
-            &ExperimentalBluetoothAgentServiceProviderImpl::AuthorizeService,
-            weak_ptr_factory_.GetWeakPtr()),
-        base::Bind(
-            &ExperimentalBluetoothAgentServiceProviderImpl::OnExported,
-            weak_ptr_factory_.GetWeakPtr()));
+        base::Bind(&BluetoothAgentServiceProviderImpl::AuthorizeService,
+                   weak_ptr_factory_.GetWeakPtr()),
+        base::Bind(&BluetoothAgentServiceProviderImpl::OnExported,
+                   weak_ptr_factory_.GetWeakPtr()));
 
     exported_object_->ExportMethod(
         bluetooth_agent::kBluetoothAgentInterface,
         bluetooth_agent::kCancel,
-        base::Bind(
-            &ExperimentalBluetoothAgentServiceProviderImpl::Cancel,
-            weak_ptr_factory_.GetWeakPtr()),
-        base::Bind(
-            &ExperimentalBluetoothAgentServiceProviderImpl::OnExported,
-            weak_ptr_factory_.GetWeakPtr()));
+        base::Bind(&BluetoothAgentServiceProviderImpl::Cancel,
+                   weak_ptr_factory_.GetWeakPtr()),
+        base::Bind(&BluetoothAgentServiceProviderImpl::OnExported,
+                   weak_ptr_factory_.GetWeakPtr()));
   }
 
-  virtual ~ExperimentalBluetoothAgentServiceProviderImpl() {
+  virtual ~BluetoothAgentServiceProviderImpl() {
     VLOG(1) << "Cleaning up Bluetooth Agent: " << object_path_.value();
 
     // Unregister the object path so we can reuse with a new agent.
@@ -170,7 +150,7 @@ class ExperimentalBluetoothAgentServiceProviderImpl
     }
 
     Delegate::PinCodeCallback callback = base::Bind(
-        &ExperimentalBluetoothAgentServiceProviderImpl::OnPinCode,
+        &BluetoothAgentServiceProviderImpl::OnPinCode,
         weak_ptr_factory_.GetWeakPtr(),
         method_call,
         response_sender);
@@ -217,7 +197,7 @@ class ExperimentalBluetoothAgentServiceProviderImpl
     }
 
     Delegate::PasskeyCallback callback = base::Bind(
-        &ExperimentalBluetoothAgentServiceProviderImpl::OnPasskey,
+        &BluetoothAgentServiceProviderImpl::OnPasskey,
         weak_ptr_factory_.GetWeakPtr(),
         method_call,
         response_sender);
@@ -270,7 +250,7 @@ class ExperimentalBluetoothAgentServiceProviderImpl
     }
 
     Delegate::ConfirmationCallback callback = base::Bind(
-        &ExperimentalBluetoothAgentServiceProviderImpl::OnConfirmation,
+        &BluetoothAgentServiceProviderImpl::OnConfirmation,
         weak_ptr_factory_.GetWeakPtr(),
         method_call,
         response_sender);
@@ -295,7 +275,7 @@ class ExperimentalBluetoothAgentServiceProviderImpl
     }
 
     Delegate::ConfirmationCallback callback = base::Bind(
-        &ExperimentalBluetoothAgentServiceProviderImpl::OnConfirmation,
+        &BluetoothAgentServiceProviderImpl::OnConfirmation,
         weak_ptr_factory_.GetWeakPtr(),
         method_call,
         response_sender);
@@ -322,7 +302,7 @@ class ExperimentalBluetoothAgentServiceProviderImpl
     }
 
     Delegate::ConfirmationCallback callback = base::Bind(
-        &ExperimentalBluetoothAgentServiceProviderImpl::OnConfirmation,
+        &BluetoothAgentServiceProviderImpl::OnConfirmation,
         weak_ptr_factory_.GetWeakPtr(),
         method_call,
         response_sender);
@@ -473,29 +453,24 @@ class ExperimentalBluetoothAgentServiceProviderImpl
   // than we do.
   // Note: This should remain the last member so it'll be destroyed and
   // invalidate its weak pointers before any other members are destroyed.
-  base::WeakPtrFactory<ExperimentalBluetoothAgentServiceProviderImpl>
-      weak_ptr_factory_;
+  base::WeakPtrFactory<BluetoothAgentServiceProviderImpl> weak_ptr_factory_;
 
-  DISALLOW_COPY_AND_ASSIGN(ExperimentalBluetoothAgentServiceProviderImpl);
+  DISALLOW_COPY_AND_ASSIGN(BluetoothAgentServiceProviderImpl);
 };
 
-ExperimentalBluetoothAgentServiceProvider::
-    ExperimentalBluetoothAgentServiceProvider() {
+BluetoothAgentServiceProvider::BluetoothAgentServiceProvider() {
 }
 
-ExperimentalBluetoothAgentServiceProvider::
-    ~ExperimentalBluetoothAgentServiceProvider() {
+BluetoothAgentServiceProvider::~BluetoothAgentServiceProvider() {
 }
 
 // static
-ExperimentalBluetoothAgentServiceProvider*
-    ExperimentalBluetoothAgentServiceProvider::Create(
-        dbus::Bus* bus,
-        const dbus::ObjectPath& object_path,
-        Delegate* delegate) {
+BluetoothAgentServiceProvider* BluetoothAgentServiceProvider::Create(
+    dbus::Bus* bus,
+    const dbus::ObjectPath& object_path,
+    Delegate* delegate) {
   if (base::chromeos::IsRunningOnChromeOS()) {
-    return new ExperimentalBluetoothAgentServiceProviderImpl(
-        bus, object_path, delegate);
+    return new BluetoothAgentServiceProviderImpl(bus, object_path, delegate);
   } else {
     return new FakeBluetoothAgentServiceProvider(object_path, delegate);
   }
diff --git a/chromeos/dbus/experimental_bluetooth_agent_service_provider.h b/chromeos/dbus/bluetooth_agent_service_provider.h
index ff264f9..3cef4d6 100644
--- a/chromeos/dbus/experimental_bluetooth_agent_service_provider.h
+++ b/chromeos/dbus/bluetooth_agent_service_provider.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Copyright 2013 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.
 
-#ifndef CHROMEOS_DBUS_EXPERIMENTAL_BLUETOOTH_AGENT_SERVICE_PROVIDER_H_
-#define CHROMEOS_DBUS_EXPERIMENTAL_BLUETOOTH_AGENT_SERVICE_PROVIDER_H_
+#ifndef CHROMEOS_DBUS_BLUETOOTH_AGENT_SERVICE_PROVIDER_H_
+#define CHROMEOS_DBUS_BLUETOOTH_AGENT_SERVICE_PROVIDER_H_
 
 #include <string>
 
@@ -15,19 +15,20 @@
 
 namespace chromeos {
 
-// ExperimentalBluetoothAgentServiceProvider is used to provide a D-Bus object
-// that BlueZ can communicate with during a remote device pairing request.
+// BluetoothAgentServiceProvider is used to provide a D-Bus object that
+// the bluetooth daemon can communicate with during a remote device pairing
+// request.
 //
 // Instantiate with a chosen D-Bus object path and delegate object, and pass
 // the D-Bus object path as the |agent_path| argument to the
-// chromeos::ExperimentalBluetoothAgentManagerClient::RegisterAgent() method.
+// chromeos::BluetoothAgentManagerClient::RegisterAgent() method.
 //
 // After initiating the pairing process with a device, using the
-// chromeos::ExperimentalBluetoothDeviceClient::Pair() method, the Bluetooth
-// daemon will make calls to this agent object and they will be passed on to
-// your Delegate object for handling. Responses should be returned using the
-// callbacks supplied to those methods.
-class CHROMEOS_EXPORT ExperimentalBluetoothAgentServiceProvider {
+// chromeos::BluetoothDeviceClient::Pair() method, the Bluetooth daemon will
+// make calls to this agent object and they will be passed on to your Delegate
+// object for handling. Responses should be returned using the callbacks
+// supplied to those methods.
+class CHROMEOS_EXPORT BluetoothAgentServiceProvider {
  public:
   // Interface for reacting to agent requests.
   class Delegate {
@@ -155,22 +156,24 @@ class CHROMEOS_EXPORT ExperimentalBluetoothAgentServiceProvider {
     virtual void Cancel() = 0;
   };
 
-  virtual ~ExperimentalBluetoothAgentServiceProvider();
+  virtual ~BluetoothAgentServiceProvider();
 
   // Creates the instance where |bus| is the D-Bus bus connection to export
   // the object onto, |object_path| is the object path that it should have
   // and |delegate| is the object to which all method calls will be passed
   // and responses generated from.
-  static ExperimentalBluetoothAgentServiceProvider* Create(
-      dbus::Bus* bus, const dbus::ObjectPath& object_path, Delegate* delegate);
+  static BluetoothAgentServiceProvider* Create(
+      dbus::Bus* bus,
+      const dbus::ObjectPath& object_path,
+      Delegate* delegate);
 
  protected:
-  ExperimentalBluetoothAgentServiceProvider();
+  BluetoothAgentServiceProvider();
 
  private:
-  DISALLOW_COPY_AND_ASSIGN(ExperimentalBluetoothAgentServiceProvider);
+  DISALLOW_COPY_AND_ASSIGN(BluetoothAgentServiceProvider);
 };
 
 }  // namespace chromeos
 
-#endif  // CHROMEOS_DBUS_EXPERIMENTAL_BLUETOOTH_AGENT_SERVICE_PROVIDER_H_
+#endif  // CHROMEOS_DBUS_BLUETOOTH_AGENT_SERVICE_PROVIDER_H_
diff --git a/chromeos/dbus/experimental_bluetooth_device_client.cc b/chromeos/dbus/bluetooth_device_client.cc
index bf50ab0..62fbab8 100644
--- a/chromeos/dbus/experimental_bluetooth_device_client.cc
+++ b/chromeos/dbus/bluetooth_device_client.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Copyright 2013 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/experimental_bluetooth_device_client.h"
+#include "chromeos/dbus/bluetooth_device_client.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ -17,12 +17,12 @@
 
 namespace chromeos {
 
-const char ExperimentalBluetoothDeviceClient::kNoResponseError[] =
+const char BluetoothDeviceClient::kNoResponseError[] =
     "org.chromium.Error.NoResponse";
-const char ExperimentalBluetoothDeviceClient::kUnknownDeviceError[] =
+const char BluetoothDeviceClient::kUnknownDeviceError[] =
     "org.chromium.Error.UnknownDevice";
 
-ExperimentalBluetoothDeviceClient::Properties::Properties(
+BluetoothDeviceClient::Properties::Properties(
     dbus::ObjectProxy* object_proxy,
     const std::string& interface_name,
     const PropertyChangedCallback& callback)
@@ -44,16 +44,16 @@ ExperimentalBluetoothDeviceClient::Properties::Properties(
   RegisterProperty(bluetooth_device::kRSSIProperty, &rssi);
 }
 
-ExperimentalBluetoothDeviceClient::Properties::~Properties() {
+BluetoothDeviceClient::Properties::~Properties() {
 }
 
 
-// The ExperimentalBluetoothDeviceClient implementation used in production.
-class ExperimentalBluetoothDeviceClientImpl
-    : public ExperimentalBluetoothDeviceClient,
+// The BluetoothDeviceClient implementation used in production.
+class BluetoothDeviceClientImpl
+    : public BluetoothDeviceClient,
       public dbus::ObjectManager::Interface {
  public:
-  explicit ExperimentalBluetoothDeviceClientImpl(dbus::Bus* bus)
+  explicit BluetoothDeviceClientImpl(dbus::Bus* bus)
       : bus_(bus),
         weak_ptr_factory_(this) {
     object_manager_ = bus_->GetObjectManager(
@@ -64,21 +64,21 @@ class ExperimentalBluetoothDeviceClientImpl
         bluetooth_device::kBluetoothDeviceInterface, this);
   }
 
-  virtual ~ExperimentalBluetoothDeviceClientImpl() {
+  virtual ~BluetoothDeviceClientImpl() {
     object_manager_->UnregisterInterface(
         bluetooth_device::kBluetoothDeviceInterface);
   }
 
-  // ExperimentalBluetoothDeviceClient override.
-  virtual void AddObserver(
-      ExperimentalBluetoothDeviceClient::Observer* observer) OVERRIDE {
+  // BluetoothDeviceClient override.
+  virtual void AddObserver(BluetoothDeviceClient::Observer* observer)
+      OVERRIDE {
     DCHECK(observer);
     observers_.AddObserver(observer);
   }
 
-  // ExperimentalBluetoothDeviceClient override.
-  virtual void RemoveObserver(
-      ExperimentalBluetoothDeviceClient::Observer* observer) OVERRIDE {
+  // BluetoothDeviceClient override.
+  virtual void RemoveObserver(BluetoothDeviceClient::Observer* observer)
+      OVERRIDE {
     DCHECK(observer);
     observers_.RemoveObserver(observer);
   }
@@ -91,13 +91,13 @@ class ExperimentalBluetoothDeviceClientImpl
     Properties* properties = new Properties(
         object_proxy,
         interface_name,
-        base::Bind(&ExperimentalBluetoothDeviceClientImpl::OnPropertyChanged,
+        base::Bind(&BluetoothDeviceClientImpl::OnPropertyChanged,
                    weak_ptr_factory_.GetWeakPtr(),
                    object_path));
     return static_cast<dbus::PropertySet*>(properties);
   }
 
-  // ExperimentalBluetoothDeviceClient override.
+  // BluetoothDeviceClient override.
   virtual std::vector<dbus::ObjectPath> GetDevicesForAdapter(
       const dbus::ObjectPath& adapter_path) OVERRIDE {
     std::vector<dbus::ObjectPath> object_paths, device_paths;
@@ -112,7 +112,7 @@ class ExperimentalBluetoothDeviceClientImpl
     return object_paths;
   }
 
-  // ExperimentalBluetoothDeviceClient override.
+  // BluetoothDeviceClient override.
   virtual Properties* GetProperties(const dbus::ObjectPath& object_path)
       OVERRIDE {
     return static_cast<Properties*>(
@@ -121,7 +121,7 @@ class ExperimentalBluetoothDeviceClientImpl
             bluetooth_device::kBluetoothDeviceInterface));
   }
 
-  // ExperimentalBluetoothDeviceClient override.
+  // BluetoothDeviceClient override.
   virtual void Connect(const dbus::ObjectPath& object_path,
                        const base::Closure& callback,
                        const ErrorCallback& error_callback) OVERRIDE {
@@ -140,13 +140,13 @@ class ExperimentalBluetoothDeviceClientImpl
     object_proxy->CallMethodWithErrorCallback(
         &method_call,
         dbus::ObjectProxy::TIMEOUT_INFINITE,
-        base::Bind(&ExperimentalBluetoothDeviceClientImpl::OnSuccess,
+        base::Bind(&BluetoothDeviceClientImpl::OnSuccess,
                    weak_ptr_factory_.GetWeakPtr(), callback),
-        base::Bind(&ExperimentalBluetoothDeviceClientImpl::OnError,
+        base::Bind(&BluetoothDeviceClientImpl::OnError,
                    weak_ptr_factory_.GetWeakPtr(), error_callback));
   }
 
-  // ExperimentalBluetoothDeviceClient override.
+  // BluetoothDeviceClient override.
   virtual void Disconnect(const dbus::ObjectPath& object_path,
                           const base::Closure& callback,
                           const ErrorCallback& error_callback) OVERRIDE {
@@ -164,13 +164,13 @@ class ExperimentalBluetoothDeviceClientImpl
     object_proxy->CallMethodWithErrorCallback(
         &method_call,
         dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
-        base::Bind(&ExperimentalBluetoothDeviceClientImpl::OnSuccess,
+        base::Bind(&BluetoothDeviceClientImpl::OnSuccess,
                    weak_ptr_factory_.GetWeakPtr(), callback),
-        base::Bind(&ExperimentalBluetoothDeviceClientImpl::OnError,
+        base::Bind(&BluetoothDeviceClientImpl::OnError,
                    weak_ptr_factory_.GetWeakPtr(), error_callback));
   }
 
-  // ExperimentalBluetoothDeviceClient override.
+  // BluetoothDeviceClient override.
   virtual void ConnectProfile(const dbus::ObjectPath& object_path,
                               const std::string& uuid,
                               const base::Closure& callback,
@@ -193,13 +193,13 @@ class ExperimentalBluetoothDeviceClientImpl
     object_proxy->CallMethodWithErrorCallback(
         &method_call,
         dbus::ObjectProxy::TIMEOUT_INFINITE,
-        base::Bind(&ExperimentalBluetoothDeviceClientImpl::OnSuccess,
+        base::Bind(&BluetoothDeviceClientImpl::OnSuccess,
                    weak_ptr_factory_.GetWeakPtr(), callback),
-        base::Bind(&ExperimentalBluetoothDeviceClientImpl::OnError,
+        base::Bind(&BluetoothDeviceClientImpl::OnError,
                    weak_ptr_factory_.GetWeakPtr(), error_callback));
   }
 
-  // ExperimentalBluetoothDeviceClient override.
+  // BluetoothDeviceClient override.
   virtual void DisconnectProfile(const dbus::ObjectPath& object_path,
                                  const std::string& uuid,
                                  const base::Closure& callback,
@@ -222,13 +222,13 @@ class ExperimentalBluetoothDeviceClientImpl
     object_proxy->CallMethodWithErrorCallback(
         &method_call,
         dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
-        base::Bind(&ExperimentalBluetoothDeviceClientImpl::OnSuccess,
+        base::Bind(&BluetoothDeviceClientImpl::OnSuccess,
                    weak_ptr_factory_.GetWeakPtr(), callback),
-        base::Bind(&ExperimentalBluetoothDeviceClientImpl::OnError,
+        base::Bind(&BluetoothDeviceClientImpl::OnError,
                    weak_ptr_factory_.GetWeakPtr(), error_callback));
   }
 
-  // ExperimentalBluetoothDeviceClient override.
+  // BluetoothDeviceClient override.
   virtual void Pair(const dbus::ObjectPath& object_path,
                     const base::Closure& callback,
                     const ErrorCallback& error_callback) OVERRIDE {
@@ -247,13 +247,13 @@ class ExperimentalBluetoothDeviceClientImpl
     object_proxy->CallMethodWithErrorCallback(
         &method_call,
         dbus::ObjectProxy::TIMEOUT_INFINITE,
-        base::Bind(&ExperimentalBluetoothDeviceClientImpl::OnSuccess,
+        base::Bind(&BluetoothDeviceClientImpl::OnSuccess,
                    weak_ptr_factory_.GetWeakPtr(), callback),
-        base::Bind(&ExperimentalBluetoothDeviceClientImpl::OnError,
+        base::Bind(&BluetoothDeviceClientImpl::OnError,
                    weak_ptr_factory_.GetWeakPtr(), error_callback));
   }
 
-  // ExperimentalBluetoothDeviceClient override.
+  // BluetoothDeviceClient override.
   virtual void CancelPairing(const dbus::ObjectPath& object_path,
                              const base::Closure& callback,
                              const ErrorCallback& error_callback)
@@ -271,9 +271,9 @@ class ExperimentalBluetoothDeviceClientImpl
     object_proxy->CallMethodWithErrorCallback(
         &method_call,
         dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
-        base::Bind(&ExperimentalBluetoothDeviceClientImpl::OnSuccess,
+        base::Bind(&BluetoothDeviceClientImpl::OnSuccess,
                    weak_ptr_factory_.GetWeakPtr(), callback),
-        base::Bind(&ExperimentalBluetoothDeviceClientImpl::OnError,
+        base::Bind(&BluetoothDeviceClientImpl::OnError,
                    weak_ptr_factory_.GetWeakPtr(), error_callback));
   }
 
@@ -282,8 +282,7 @@ class ExperimentalBluetoothDeviceClientImpl
   // is created. Informs observers.
   virtual void ObjectAdded(const dbus::ObjectPath& object_path,
                            const std::string& interface_name) OVERRIDE {
-    FOR_EACH_OBSERVER(ExperimentalBluetoothDeviceClient::Observer,
-                      observers_,
+    FOR_EACH_OBSERVER(BluetoothDeviceClient::Observer, observers_,
                       DeviceAdded(object_path));
   }
 
@@ -291,8 +290,7 @@ class ExperimentalBluetoothDeviceClientImpl
   // is removed. Informs observers.
   virtual void ObjectRemoved(const dbus::ObjectPath& object_path,
                              const std::string& interface_name) OVERRIDE {
-    FOR_EACH_OBSERVER(ExperimentalBluetoothDeviceClient::Observer,
-                      observers_,
+    FOR_EACH_OBSERVER(BluetoothDeviceClient::Observer, observers_,
                       DeviceRemoved(object_path));
   }
 
@@ -301,7 +299,7 @@ class ExperimentalBluetoothDeviceClientImpl
   // call. Informs observers.
   void OnPropertyChanged(const dbus::ObjectPath& object_path,
                          const std::string& property_name) {
-    FOR_EACH_OBSERVER(ExperimentalBluetoothDeviceClient::Observer, observers_,
+    FOR_EACH_OBSERVER(BluetoothDeviceClient::Observer, observers_,
                       DevicePropertyChanged(object_path, property_name));
   }
 
@@ -333,28 +331,28 @@ class ExperimentalBluetoothDeviceClientImpl
   dbus::ObjectManager* object_manager_;
 
   // List of observers interested in event notifications from us.
-  ObserverList<ExperimentalBluetoothDeviceClient::Observer> observers_;
+  ObserverList<BluetoothDeviceClient::Observer> observers_;
 
   // Weak pointer factory for generating 'this' pointers that might live longer
   // than we do.
   // Note: This should remain the last member so it'll be destroyed and
   // invalidate its weak pointers before any other members are destroyed.
-  base::WeakPtrFactory<ExperimentalBluetoothDeviceClientImpl> weak_ptr_factory_;
+  base::WeakPtrFactory<BluetoothDeviceClientImpl> weak_ptr_factory_;
 
-  DISALLOW_COPY_AND_ASSIGN(ExperimentalBluetoothDeviceClientImpl);
+  DISALLOW_COPY_AND_ASSIGN(BluetoothDeviceClientImpl);
 };
 
-ExperimentalBluetoothDeviceClient::ExperimentalBluetoothDeviceClient() {
+BluetoothDeviceClient::BluetoothDeviceClient() {
 }
 
-ExperimentalBluetoothDeviceClient::~ExperimentalBluetoothDeviceClient() {
+BluetoothDeviceClient::~BluetoothDeviceClient() {
 }
 
-ExperimentalBluetoothDeviceClient* ExperimentalBluetoothDeviceClient::Create(
+BluetoothDeviceClient* BluetoothDeviceClient::Create(
     DBusClientImplementationType type,
     dbus::Bus* bus) {
   if (type == REAL_DBUS_CLIENT_IMPLEMENTATION)
-    return new ExperimentalBluetoothDeviceClientImpl(bus);
+    return new BluetoothDeviceClientImpl(bus);
   DCHECK_EQ(STUB_DBUS_CLIENT_IMPLEMENTATION, type);
   return new FakeBluetoothDeviceClient();
 }
diff --git a/chromeos/dbus/experimental_bluetooth_device_client.h b/chromeos/dbus/bluetooth_device_client.h
index c89ae79..a0066e0 100644
--- a/chromeos/dbus/experimental_bluetooth_device_client.h
+++ b/chromeos/dbus/bluetooth_device_client.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Copyright 2013 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.
 
-#ifndef CHROMEOS_DBUS_EXPERIMENTAL_BLUETOOTH_DEVICE_CLIENT_H_
-#define CHROMEOS_DBUS_EXPERIMENTAL_BLUETOOTH_DEVICE_CLIENT_H_
+#ifndef CHROMEOS_DBUS_BLUETOOTH_DEVICE_CLIENT_H_
+#define CHROMEOS_DBUS_BLUETOOTH_DEVICE_CLIENT_H_
 
 #include <string>
 #include <vector>
@@ -22,9 +22,9 @@ class Bus;
 
 namespace chromeos {
 
-// ExperimentalBluetoothDeviceClient is used to communicate with Bluetooth
-// Device objects.
-class CHROMEOS_EXPORT ExperimentalBluetoothDeviceClient {
+// BluetoothDeviceClient is used to communicate with objects representing
+// remote Bluetooth Devices.
+class CHROMEOS_EXPORT BluetoothDeviceClient {
  public:
   // Structure of properties associated with bluetooth devices.
   struct Properties : public dbus::PropertySet {
@@ -108,7 +108,7 @@ class CHROMEOS_EXPORT ExperimentalBluetoothDeviceClient {
                                        const std::string& property_name) {}
   };
 
-  virtual ~ExperimentalBluetoothDeviceClient();
+  virtual ~BluetoothDeviceClient();
 
   // Adds and removes observers for events on all remote bluetooth
   // devices. Check the |object_path| parameter of observer methods to
@@ -174,21 +174,20 @@ class CHROMEOS_EXPORT ExperimentalBluetoothDeviceClient {
                              const ErrorCallback& error_callback) = 0;
 
   // Creates the instance.
-  static ExperimentalBluetoothDeviceClient* Create(
-      DBusClientImplementationType type,
-      dbus::Bus* bus);
+  static BluetoothDeviceClient* Create(DBusClientImplementationType type,
+                                       dbus::Bus* bus);
 
   // Constants used to indicate exceptional error conditions.
   static const char kNoResponseError[];
   static const char kUnknownDeviceError[];
 
  protected:
-  ExperimentalBluetoothDeviceClient();
+  BluetoothDeviceClient();
 
  private:
-  DISALLOW_COPY_AND_ASSIGN(ExperimentalBluetoothDeviceClient);
+  DISALLOW_COPY_AND_ASSIGN(BluetoothDeviceClient);
 };
 
 }  // namespace chromeos
 
-#endif  // CHROMEOS_DBUS_EXPERIMENTAL_BLUETOOTH_DEVICE_CLIENT_H_
+#endif  // CHROMEOS_DBUS_BLUETOOTH_DEVICE_CLIENT_H_
diff --git a/chromeos/dbus/experimental_bluetooth_input_client.cc b/chromeos/dbus/bluetooth_input_client.cc
index ccbc896..0d1eb53 100644
--- a/chromeos/dbus/experimental_bluetooth_input_client.cc
+++ b/chromeos/dbus/bluetooth_input_client.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Copyright 2013 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/experimental_bluetooth_input_client.h"
+#include "chromeos/dbus/bluetooth_input_client.h"
 
 #include <map>
 
@@ -18,7 +18,7 @@
 
 namespace chromeos {
 
-ExperimentalBluetoothInputClient::Properties::Properties(
+BluetoothInputClient::Properties::Properties(
     dbus::ObjectProxy* object_proxy,
     const std::string& interface_name,
     const PropertyChangedCallback& callback)
@@ -26,16 +26,16 @@ ExperimentalBluetoothInputClient::Properties::Properties(
   RegisterProperty(bluetooth_input::kReconnectModeProperty, &reconnect_mode);
 }
 
-ExperimentalBluetoothInputClient::Properties::~Properties() {
+BluetoothInputClient::Properties::~Properties() {
 }
 
 
-// The ExperimentalBluetoothInputClient implementation used in production.
-class ExperimentalBluetoothInputClientImpl
-    : public ExperimentalBluetoothInputClient,
+// The BluetoothInputClient implementation used in production.
+class BluetoothInputClientImpl
+    : public BluetoothInputClient,
       public dbus::ObjectManager::Interface {
  public:
-  explicit ExperimentalBluetoothInputClientImpl(dbus::Bus* bus)
+  explicit BluetoothInputClientImpl(dbus::Bus* bus)
       : bus_(bus),
         weak_ptr_factory_(this) {
     object_manager_ = bus_->GetObjectManager(
@@ -46,21 +46,21 @@ class ExperimentalBluetoothInputClientImpl
         bluetooth_input::kBluetoothInputInterface, this);
   }
 
-  virtual ~ExperimentalBluetoothInputClientImpl() {
+  virtual ~BluetoothInputClientImpl() {
     object_manager_->UnregisterInterface(
         bluetooth_input::kBluetoothInputInterface);
   }
 
-  // ExperimentalBluetoothInputClient override.
-  virtual void AddObserver(
-      ExperimentalBluetoothInputClient::Observer* observer) OVERRIDE {
+  // BluetoothInputClient override.
+  virtual void AddObserver(BluetoothInputClient::Observer* observer)
+      OVERRIDE {
     DCHECK(observer);
     observers_.AddObserver(observer);
   }
 
-  // ExperimentalBluetoothInputClient override.
-  virtual void RemoveObserver(
-      ExperimentalBluetoothInputClient::Observer* observer) OVERRIDE {
+  // BluetoothInputClient override.
+  virtual void RemoveObserver(BluetoothInputClient::Observer* observer)
+      OVERRIDE {
     DCHECK(observer);
     observers_.RemoveObserver(observer);
   }
@@ -73,13 +73,13 @@ class ExperimentalBluetoothInputClientImpl
     Properties* properties = new Properties(
         object_proxy,
         interface_name,
-        base::Bind(&ExperimentalBluetoothInputClientImpl::OnPropertyChanged,
+        base::Bind(&BluetoothInputClientImpl::OnPropertyChanged,
                    weak_ptr_factory_.GetWeakPtr(),
                    object_path));
     return static_cast<dbus::PropertySet*>(properties);
   }
 
-  // ExperimentalBluetoothInputClient override.
+  // BluetoothInputClient override.
   virtual Properties* GetProperties(const dbus::ObjectPath& object_path)
       OVERRIDE {
     return static_cast<Properties*>(
@@ -93,7 +93,7 @@ class ExperimentalBluetoothInputClientImpl
   // is created. Informs observers.
   virtual void ObjectAdded(const dbus::ObjectPath& object_path,
                            const std::string& interface_name) OVERRIDE {
-    FOR_EACH_OBSERVER(ExperimentalBluetoothInputClient::Observer, observers_,
+    FOR_EACH_OBSERVER(BluetoothInputClient::Observer, observers_,
                       InputAdded(object_path));
   }
 
@@ -101,7 +101,7 @@ class ExperimentalBluetoothInputClientImpl
   // is removed. Informs observers.
   virtual void ObjectRemoved(const dbus::ObjectPath& object_path,
                              const std::string& interface_name) OVERRIDE {
-    FOR_EACH_OBSERVER(ExperimentalBluetoothInputClient::Observer, observers_,
+    FOR_EACH_OBSERVER(BluetoothInputClient::Observer, observers_,
                       InputRemoved(object_path));
   }
 
@@ -110,7 +110,7 @@ class ExperimentalBluetoothInputClientImpl
   // call. Informs observers.
   void OnPropertyChanged(const dbus::ObjectPath& object_path,
                          const std::string& property_name) {
-    FOR_EACH_OBSERVER(ExperimentalBluetoothInputClient::Observer, observers_,
+    FOR_EACH_OBSERVER(BluetoothInputClient::Observer, observers_,
                       InputPropertyChanged(object_path, property_name));
   }
 
@@ -118,28 +118,28 @@ class ExperimentalBluetoothInputClientImpl
   dbus::ObjectManager* object_manager_;
 
   // List of observers interested in event notifications from us.
-  ObserverList<ExperimentalBluetoothInputClient::Observer> observers_;
+  ObserverList<BluetoothInputClient::Observer> observers_;
 
   // Weak pointer factory for generating 'this' pointers that might live longer
   // than we do.
   // Note: This should remain the last member so it'll be destroyed and
   // invalidate its weak pointers before any other members are destroyed.
-  base::WeakPtrFactory<ExperimentalBluetoothInputClientImpl> weak_ptr_factory_;
+  base::WeakPtrFactory<BluetoothInputClientImpl> weak_ptr_factory_;
 
-  DISALLOW_COPY_AND_ASSIGN(ExperimentalBluetoothInputClientImpl);
+  DISALLOW_COPY_AND_ASSIGN(BluetoothInputClientImpl);
 };
 
-ExperimentalBluetoothInputClient::ExperimentalBluetoothInputClient() {
+BluetoothInputClient::BluetoothInputClient() {
 }
 
-ExperimentalBluetoothInputClient::~ExperimentalBluetoothInputClient() {
+BluetoothInputClient::~BluetoothInputClient() {
 }
 
-ExperimentalBluetoothInputClient* ExperimentalBluetoothInputClient::Create(
+BluetoothInputClient* BluetoothInputClient::Create(
     DBusClientImplementationType type,
     dbus::Bus* bus) {
   if (type == REAL_DBUS_CLIENT_IMPLEMENTATION)
-    return new ExperimentalBluetoothInputClientImpl(bus);
+    return new BluetoothInputClientImpl(bus);
   DCHECK_EQ(STUB_DBUS_CLIENT_IMPLEMENTATION, type);
   return new FakeBluetoothInputClient();
 }
diff --git a/chromeos/dbus/experimental_bluetooth_input_client.h b/chromeos/dbus/bluetooth_input_client.h
index 09a6a6b..d4d25d3 100644
--- a/chromeos/dbus/experimental_bluetooth_input_client.h
+++ b/chromeos/dbus/bluetooth_input_client.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Copyright 2013 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.
 
-#ifndef CHROMEOS_DBUS_EXPERIMENTAL_BLUETOOTH_INPUT_CLIENT_H_
-#define CHROMEOS_DBUS_EXPERIMENTAL_BLUETOOTH_INPUT_CLIENT_H_
+#ifndef CHROMEOS_DBUS_BLUETOOTH_INPUT_CLIENT_H_
+#define CHROMEOS_DBUS_BLUETOOTH_INPUT_CLIENT_H_
 
 #include <string>
 #include <vector>
@@ -21,9 +21,9 @@ class Bus;
 
 namespace chromeos {
 
-// ExperimentalBluetoothInputClient is used to communicate with Bluetooth
-// Input objects.
-class CHROMEOS_EXPORT ExperimentalBluetoothInputClient {
+// BluetoothInputClient is used to communicate with objects representing
+// Bluetooth Input (HID) devices.
+class CHROMEOS_EXPORT BluetoothInputClient {
  public:
   // Structure of properties associated with bluetooth input devices.
   struct Properties : public dbus::PropertySet {
@@ -58,7 +58,7 @@ class CHROMEOS_EXPORT ExperimentalBluetoothInputClient {
                                       const std::string& property_name) {}
   };
 
-  virtual ~ExperimentalBluetoothInputClient();
+  virtual ~BluetoothInputClient();
 
   // Adds and removes observers for events on all remote bluetooth input
   // devices. Check the |object_path| parameter of observer methods to
@@ -71,17 +71,16 @@ class CHROMEOS_EXPORT ExperimentalBluetoothInputClient {
   virtual Properties* GetProperties(const dbus::ObjectPath& object_path) = 0;
 
   // Creates the instance.
-  static ExperimentalBluetoothInputClient* Create(
-      DBusClientImplementationType type,
-      dbus::Bus* bus);
+  static BluetoothInputClient* Create(DBusClientImplementationType type,
+                                      dbus::Bus* bus);
 
  protected:
-  ExperimentalBluetoothInputClient();
+  BluetoothInputClient();
 
  private:
-  DISALLOW_COPY_AND_ASSIGN(ExperimentalBluetoothInputClient);
+  DISALLOW_COPY_AND_ASSIGN(BluetoothInputClient);
 };
 
 }  // namespace chromeos
 
-#endif  // CHROMEOS_DBUS_EXPERIMENTAL_BLUETOOTH_INPUT_CLIENT_H_
+#endif  // CHROMEOS_DBUS_BLUETOOTH_INPUT_CLIENT_H_
diff --git a/chromeos/dbus/experimental_bluetooth_profile_manager_client.cc b/chromeos/dbus/bluetooth_profile_manager_client.cc
index 1d3562e..6f2875b 100644
--- a/chromeos/dbus/experimental_bluetooth_profile_manager_client.cc
+++ b/chromeos/dbus/bluetooth_profile_manager_client.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Copyright 2013 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/experimental_bluetooth_profile_manager_client.h"
+#include "chromeos/dbus/bluetooth_profile_manager_client.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ -15,26 +15,25 @@
 
 namespace chromeos {
 
-const char ExperimentalBluetoothProfileManagerClient::kNoResponseError[] =
+const char BluetoothProfileManagerClient::kNoResponseError[] =
     "org.chromium.Error.NoResponse";
 
 
-ExperimentalBluetoothProfileManagerClient::Options::Options()
+BluetoothProfileManagerClient::Options::Options()
     : role(SYMMETRIC),
       require_authentication(false),
       require_authorization(false),
       auto_connect(true) {
 }
 
-ExperimentalBluetoothProfileManagerClient::Options::~Options() {
+BluetoothProfileManagerClient::Options::~Options() {
 }
 
-// The ExperimentalBluetoothProfileManagerClient implementation used in
-// production.
-class ExperimentalBluetoothProfileManagerClientImpl
-    : public ExperimentalBluetoothProfileManagerClient {
+// The BluetoothProfileManagerClient implementation used in production.
+class BluetoothProfileManagerClientImpl
+    : public BluetoothProfileManagerClient {
  public:
-  explicit ExperimentalBluetoothProfileManagerClientImpl(dbus::Bus* bus)
+  explicit BluetoothProfileManagerClientImpl(dbus::Bus* bus)
       : bus_(bus),
         weak_ptr_factory_(this) {
     DCHECK(bus_);
@@ -44,10 +43,10 @@ class ExperimentalBluetoothProfileManagerClientImpl
             bluetooth_profile_manager::kBluetoothProfileManagerServicePath));
   }
 
-  virtual ~ExperimentalBluetoothProfileManagerClientImpl() {
+  virtual ~BluetoothProfileManagerClientImpl() {
   }
 
-  // ExperimentalBluetoothProfileManagerClient override.
+  // BluetoothProfileManagerClient override.
   virtual void RegisterProfile(const dbus::ObjectPath& profile_path,
                                const std::string& uuid,
                                const Options& options,
@@ -166,13 +165,13 @@ class ExperimentalBluetoothProfileManagerClientImpl
     object_proxy_->CallMethodWithErrorCallback(
         &method_call,
         dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
-        base::Bind(&ExperimentalBluetoothProfileManagerClientImpl::OnSuccess,
+        base::Bind(&BluetoothProfileManagerClientImpl::OnSuccess,
                    weak_ptr_factory_.GetWeakPtr(), callback),
-        base::Bind(&ExperimentalBluetoothProfileManagerClientImpl::OnError,
+        base::Bind(&BluetoothProfileManagerClientImpl::OnError,
                    weak_ptr_factory_.GetWeakPtr(), error_callback));
   }
 
-  // ExperimentalBluetoothProfileManagerClient override.
+  // BluetoothProfileManagerClient override.
   virtual void UnregisterProfile(const dbus::ObjectPath& profile_path,
                                  const base::Closure& callback,
                                  const ErrorCallback& error_callback) OVERRIDE {
@@ -186,9 +185,9 @@ class ExperimentalBluetoothProfileManagerClientImpl
     object_proxy_->CallMethodWithErrorCallback(
         &method_call,
         dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
-        base::Bind(&ExperimentalBluetoothProfileManagerClientImpl::OnSuccess,
+        base::Bind(&BluetoothProfileManagerClientImpl::OnSuccess,
                    weak_ptr_factory_.GetWeakPtr(), callback),
-        base::Bind(&ExperimentalBluetoothProfileManagerClientImpl::OnError,
+        base::Bind(&BluetoothProfileManagerClientImpl::OnError,
                    weak_ptr_factory_.GetWeakPtr(), error_callback));
   }
 
@@ -224,26 +223,22 @@ class ExperimentalBluetoothProfileManagerClientImpl
   // than we do.
   // Note: This should remain the last member so it'll be destroyed and
   // invalidate its weak pointers before any other members are destroyed.
-  base::WeakPtrFactory<ExperimentalBluetoothProfileManagerClientImpl>
-      weak_ptr_factory_;
+  base::WeakPtrFactory<BluetoothProfileManagerClientImpl> weak_ptr_factory_;
 
-  DISALLOW_COPY_AND_ASSIGN(ExperimentalBluetoothProfileManagerClientImpl);
+  DISALLOW_COPY_AND_ASSIGN(BluetoothProfileManagerClientImpl);
 };
 
-ExperimentalBluetoothProfileManagerClient::
-    ExperimentalBluetoothProfileManagerClient() {
+BluetoothProfileManagerClient::BluetoothProfileManagerClient() {
 }
 
-ExperimentalBluetoothProfileManagerClient::
-    ~ExperimentalBluetoothProfileManagerClient() {
+BluetoothProfileManagerClient::~BluetoothProfileManagerClient() {
 }
 
-ExperimentalBluetoothProfileManagerClient*
-    ExperimentalBluetoothProfileManagerClient::Create(
-        DBusClientImplementationType type,
-        dbus::Bus* bus) {
+BluetoothProfileManagerClient* BluetoothProfileManagerClient::Create(
+    DBusClientImplementationType type,
+    dbus::Bus* bus) {
   if (type == REAL_DBUS_CLIENT_IMPLEMENTATION)
-    return new ExperimentalBluetoothProfileManagerClientImpl(bus);
+    return new BluetoothProfileManagerClientImpl(bus);
   DCHECK_EQ(STUB_DBUS_CLIENT_IMPLEMENTATION, type);
   return new FakeBluetoothProfileManagerClient();
 }
diff --git a/chromeos/dbus/experimental_bluetooth_profile_manager_client.h b/chromeos/dbus/bluetooth_profile_manager_client.h
index df92936..bcf92ddb 100644
--- a/chromeos/dbus/experimental_bluetooth_profile_manager_client.h
+++ b/chromeos/dbus/bluetooth_profile_manager_client.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Copyright 2013 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.
 
-#ifndef CHROMEOS_DBUS_EXPERIMENTAL_BLUETOOTH_PROFILE_MANAGER_CLIENT_H_
-#define CHROMEOS_DBUS_EXPERIMENTAL_BLUETOOTH_PROFILE_MANAGER_CLIENT_H_
+#ifndef CHROMEOS_DBUS_BLUETOOTH_PROFILE_MANAGER_CLIENT_H_
+#define CHROMEOS_DBUS_BLUETOOTH_PROFILE_MANAGER_CLIENT_H_
 
 #include <string>
 #include <vector>
@@ -20,9 +20,9 @@ class Bus;
 
 namespace chromeos {
 
-// ExperimentalBluetoothProfileManagerClient is used to communicate with
-// Bluetooth profile manager objects.
-class CHROMEOS_EXPORT ExperimentalBluetoothProfileManagerClient {
+// BluetoothProfileManagerClient is used to communicate with the profile
+// manager object of the Bluetooth daemon.
+class CHROMEOS_EXPORT BluetoothProfileManagerClient {
  public:
   // Species the role of the object within the profile. SYMMETRIC should be
   // usually used unless the profile requires you specify as a CLIENT or as a
@@ -72,7 +72,7 @@ class CHROMEOS_EXPORT ExperimentalBluetoothProfileManagerClient {
     uint16 features;
   };
 
-  virtual ~ExperimentalBluetoothProfileManagerClient();
+  virtual ~BluetoothProfileManagerClient();
 
   // The ErrorCallback is used by adapter methods to indicate failure.
   // It receives two arguments: the name of the error in |error_name| and
@@ -98,7 +98,7 @@ class CHROMEOS_EXPORT ExperimentalBluetoothProfileManagerClient {
 
 
   // Creates the instance.
-  static ExperimentalBluetoothProfileManagerClient* Create(
+  static BluetoothProfileManagerClient* Create(
       DBusClientImplementationType type,
       dbus::Bus* bus);
 
@@ -106,12 +106,12 @@ class CHROMEOS_EXPORT ExperimentalBluetoothProfileManagerClient {
   static const char kNoResponseError[];
 
  protected:
-  ExperimentalBluetoothProfileManagerClient();
+  BluetoothProfileManagerClient();
 
  private:
-  DISALLOW_COPY_AND_ASSIGN(ExperimentalBluetoothProfileManagerClient);
+  DISALLOW_COPY_AND_ASSIGN(BluetoothProfileManagerClient);
 };
 
 }  // namespace chromeos
 
-#endif  // CHROMEOS_DBUS_EXPERIMENTAL_BLUETOOTH_PROFILE_MANAGER_CLIENT_H_
+#endif  // CHROMEOS_DBUS_BLUETOOTH_PROFILE_MANAGER_CLIENT_H_
diff --git a/chromeos/dbus/experimental_bluetooth_profile_service_provider.cc b/chromeos/dbus/bluetooth_profile_service_provider.cc
index 4d69e69..dda9714 100644
--- a/chromeos/dbus/experimental_bluetooth_profile_service_provider.cc
+++ b/chromeos/dbus/bluetooth_profile_service_provider.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Copyright 2013 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/experimental_bluetooth_profile_service_provider.h"
+#include "chromeos/dbus/bluetooth_profile_service_provider.h"
 
 #include <string>
 
@@ -20,15 +20,13 @@
 
 namespace chromeos {
 
-// The ExperimentalBluetoothProfileServiceProvider implementation used in
-// production.
-class ExperimentalBluetoothProfileServiceProviderImpl
-    : public ExperimentalBluetoothProfileServiceProvider {
+// The BluetoothProfileServiceProvider implementation used in production.
+class BluetoothProfileServiceProviderImpl
+    : public BluetoothProfileServiceProvider {
  public:
-  ExperimentalBluetoothProfileServiceProviderImpl(
-      dbus::Bus* bus,
-      const dbus::ObjectPath& object_path,
-      Delegate* delegate)
+  BluetoothProfileServiceProviderImpl(dbus::Bus* bus,
+                                      const dbus::ObjectPath& object_path,
+                                      Delegate* delegate)
       : origin_thread_id_(base::PlatformThread::CurrentId()),
         bus_(bus),
         delegate_(delegate),
@@ -41,45 +39,37 @@ class ExperimentalBluetoothProfileServiceProviderImpl
     exported_object_->ExportMethod(
         bluetooth_profile::kBluetoothProfileInterface,
         bluetooth_profile::kRelease,
-        base::Bind(
-            &ExperimentalBluetoothProfileServiceProviderImpl::Release,
-            weak_ptr_factory_.GetWeakPtr()),
-        base::Bind(
-            &ExperimentalBluetoothProfileServiceProviderImpl::OnExported,
-            weak_ptr_factory_.GetWeakPtr()));
+        base::Bind(&BluetoothProfileServiceProviderImpl::Release,
+                   weak_ptr_factory_.GetWeakPtr()),
+        base::Bind(&BluetoothProfileServiceProviderImpl::OnExported,
+                   weak_ptr_factory_.GetWeakPtr()));
 
     exported_object_->ExportMethod(
         bluetooth_profile::kBluetoothProfileInterface,
         bluetooth_profile::kNewConnection,
-        base::Bind(
-            &ExperimentalBluetoothProfileServiceProviderImpl::NewConnection,
-            weak_ptr_factory_.GetWeakPtr()),
-        base::Bind(
-            &ExperimentalBluetoothProfileServiceProviderImpl::OnExported,
-            weak_ptr_factory_.GetWeakPtr()));
+        base::Bind(&BluetoothProfileServiceProviderImpl::NewConnection,
+                   weak_ptr_factory_.GetWeakPtr()),
+        base::Bind(&BluetoothProfileServiceProviderImpl::OnExported,
+                   weak_ptr_factory_.GetWeakPtr()));
 
     exported_object_->ExportMethod(
         bluetooth_profile::kBluetoothProfileInterface,
         bluetooth_profile::kRequestDisconnection,
-        base::Bind(
-         &ExperimentalBluetoothProfileServiceProviderImpl::RequestDisconnection,
-            weak_ptr_factory_.GetWeakPtr()),
-        base::Bind(
-            &ExperimentalBluetoothProfileServiceProviderImpl::OnExported,
-            weak_ptr_factory_.GetWeakPtr()));
+        base::Bind(&BluetoothProfileServiceProviderImpl::RequestDisconnection,
+                   weak_ptr_factory_.GetWeakPtr()),
+        base::Bind(&BluetoothProfileServiceProviderImpl::OnExported,
+                   weak_ptr_factory_.GetWeakPtr()));
 
     exported_object_->ExportMethod(
         bluetooth_profile::kBluetoothProfileInterface,
         bluetooth_profile::kCancel,
-        base::Bind(
-            &ExperimentalBluetoothProfileServiceProviderImpl::Cancel,
-            weak_ptr_factory_.GetWeakPtr()),
-        base::Bind(
-            &ExperimentalBluetoothProfileServiceProviderImpl::OnExported,
-            weak_ptr_factory_.GetWeakPtr()));
+        base::Bind(&BluetoothProfileServiceProviderImpl::Cancel,
+                   weak_ptr_factory_.GetWeakPtr()),
+        base::Bind(&BluetoothProfileServiceProviderImpl::OnExported,
+                   weak_ptr_factory_.GetWeakPtr()));
   }
 
-  virtual ~ExperimentalBluetoothProfileServiceProviderImpl() {
+  virtual ~BluetoothProfileServiceProviderImpl() {
     VLOG(1) << "Cleaning up Bluetooth Profile: " << object_path_.value();
 
     // Unregister the object path so we can reuse with a new agent.
@@ -140,7 +130,7 @@ class ExperimentalBluetoothProfileServiceProviderImpl
     }
 
     Delegate::ConfirmationCallback callback = base::Bind(
-        &ExperimentalBluetoothProfileServiceProviderImpl::OnConfirmation,
+        &BluetoothProfileServiceProviderImpl::OnConfirmation,
         weak_ptr_factory_.GetWeakPtr(),
         method_call,
         response_sender);
@@ -165,7 +155,7 @@ class ExperimentalBluetoothProfileServiceProviderImpl
     }
 
     Delegate::ConfirmationCallback callback = base::Bind(
-        &ExperimentalBluetoothProfileServiceProviderImpl::OnConfirmation,
+        &BluetoothProfileServiceProviderImpl::OnConfirmation,
         weak_ptr_factory_.GetWeakPtr(),
         method_call,
         response_sender);
@@ -246,29 +236,24 @@ class ExperimentalBluetoothProfileServiceProviderImpl
   // than we do.
   // Note: This should remain the last member so it'll be destroyed and
   // invalidate its weak pointers before any other members are destroyed.
-  base::WeakPtrFactory<ExperimentalBluetoothProfileServiceProviderImpl>
-      weak_ptr_factory_;
+  base::WeakPtrFactory<BluetoothProfileServiceProviderImpl> weak_ptr_factory_;
 
-  DISALLOW_COPY_AND_ASSIGN(ExperimentalBluetoothProfileServiceProviderImpl);
+  DISALLOW_COPY_AND_ASSIGN(BluetoothProfileServiceProviderImpl);
 };
 
-ExperimentalBluetoothProfileServiceProvider::
-    ExperimentalBluetoothProfileServiceProvider() {
+BluetoothProfileServiceProvider::BluetoothProfileServiceProvider() {
 }
 
-ExperimentalBluetoothProfileServiceProvider::
-    ~ExperimentalBluetoothProfileServiceProvider() {
+BluetoothProfileServiceProvider::~BluetoothProfileServiceProvider() {
 }
 
 // static
-ExperimentalBluetoothProfileServiceProvider*
-    ExperimentalBluetoothProfileServiceProvider::Create(
-        dbus::Bus* bus,
-        const dbus::ObjectPath& object_path,
-        Delegate* delegate) {
+BluetoothProfileServiceProvider* BluetoothProfileServiceProvider::Create(
+    dbus::Bus* bus,
+    const dbus::ObjectPath& object_path,
+    Delegate* delegate) {
   if (base::chromeos::IsRunningOnChromeOS()) {
-    return new ExperimentalBluetoothProfileServiceProviderImpl(
-        bus, object_path, delegate);
+    return new BluetoothProfileServiceProviderImpl(bus, object_path, delegate);
   } else {
     return new FakeBluetoothProfileServiceProvider(object_path, delegate);
   }
diff --git a/chromeos/dbus/experimental_bluetooth_profile_service_provider.h b/chromeos/dbus/bluetooth_profile_service_provider.h
index 4649696..ee942cf 100644
--- a/chromeos/dbus/experimental_bluetooth_profile_service_provider.h
+++ b/chromeos/dbus/bluetooth_profile_service_provider.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Copyright 2013 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.
 
-#ifndef CHROMEOS_DBUS_EXPERIMENTAL_BLUETOOTH_PROFILE_SERVICE_PROVIDER_H_
-#define CHROMEOS_DBUS_EXPERIMENTAL_BLUETOOTH_PROFILE_SERVICE_PROVIDER_H_
+#ifndef CHROMEOS_DBUS_BLUETOOTH_PROFILE_SERVICE_PROVIDER_H_
+#define CHROMEOS_DBUS_BLUETOOTH_PROFILE_SERVICE_PROVIDER_H_
 
 #include <string>
 
@@ -17,20 +17,19 @@
 
 namespace chromeos {
 
-// ExperimentalBluetoothProfileServiceProvider is used to provide a D-Bus
-// object that BlueZ can communicate with to connect application profiles.
+// BluetoothProfileServiceProvider is used to provide a D-Bus object that the
+// Bluetooth daemon can communicate with to connect application profiles.
 //
 // Instantiate with a chosen D-Bus object path and delegate object, and pass
 // the D-Bus object path as the |agent_path| argument to the
-// chromeos::ExperimentalBluetoothProfileManagerClient::RegisterProfile()
-// method.
+// chromeos::BluetoothProfileManagerClient::RegisterProfile() method.
 //
 // When an incoming profile connection occurs, or after initiating a connection
-// using the chromeos::ExperimentalBluetoothDeviceClient::ConnectProfile()
-// method, the Bluetooth daemon will make calls to this profile object and they
-// will be passed on to your Delegate object for handling. Responses should be
-// returned using the callbacks supplied to those methods.
-class CHROMEOS_EXPORT ExperimentalBluetoothProfileServiceProvider {
+// using the chromeos::BluetoothDeviceClient::ConnectProfile() method, the
+// Bluetooth daemon will make calls to this profile object and they will be
+// passed on to your Delegate object for handling. Responses should be returned
+// using the callbacks supplied to those methods.
+class CHROMEOS_EXPORT BluetoothProfileServiceProvider {
  public:
   // Interface for reacting to profile requests.
   class Delegate {
@@ -100,22 +99,24 @@ class CHROMEOS_EXPORT ExperimentalBluetoothProfileServiceProvider {
     virtual void Cancel() = 0;
   };
 
-  virtual ~ExperimentalBluetoothProfileServiceProvider();
+  virtual ~BluetoothProfileServiceProvider();
 
   // Creates the instance where |bus| is the D-Bus bus connection to export
   // the object onto, |object_path| is the object path that it should have
   // and |delegate| is the object to which all method calls will be passed
   // and responses generated from.
-  static ExperimentalBluetoothProfileServiceProvider* Create(
-      dbus::Bus* bus, const dbus::ObjectPath& object_path, Delegate* delegate);
+  static BluetoothProfileServiceProvider* Create(
+      dbus::Bus* bus,
+      const dbus::ObjectPath& object_path,
+      Delegate* delegate);
 
  protected:
-  ExperimentalBluetoothProfileServiceProvider();
+  BluetoothProfileServiceProvider();
 
  private:
-  DISALLOW_COPY_AND_ASSIGN(ExperimentalBluetoothProfileServiceProvider);
+  DISALLOW_COPY_AND_ASSIGN(BluetoothProfileServiceProvider);
 };
 
 }  // namespace chromeos
 
-#endif  // CHROMEOS_DBUS_EXPERIMENTAL_BLUETOOTH_PROFILE_SERVICE_PROVIDER_H_
+#endif  // CHROMEOS_DBUS_BLUETOOTH_PROFILE_SERVICE_PROVIDER_H_
diff --git a/chromeos/dbus/dbus_thread_manager.cc b/chromeos/dbus/dbus_thread_manager.cc
index e7605eb..f76edb1 100644
--- a/chromeos/dbus/dbus_thread_manager.cc
+++ b/chromeos/dbus/dbus_thread_manager.cc
@@ -11,17 +11,17 @@
 #include "base/observer_list.h"
 #include "base/threading/thread.h"
 #include "chromeos/chromeos_switches.h"
+#include "chromeos/dbus/bluetooth_adapter_client.h"
+#include "chromeos/dbus/bluetooth_agent_manager_client.h"
+#include "chromeos/dbus/bluetooth_device_client.h"
+#include "chromeos/dbus/bluetooth_input_client.h"
+#include "chromeos/dbus/bluetooth_profile_manager_client.h"
 #include "chromeos/dbus/cras_audio_client.h"
 #include "chromeos/dbus/cros_disks_client.h"
 #include "chromeos/dbus/cryptohome_client.h"
 #include "chromeos/dbus/dbus_client_implementation_type.h"
 #include "chromeos/dbus/dbus_thread_manager_observer.h"
 #include "chromeos/dbus/debug_daemon_client.h"
-#include "chromeos/dbus/experimental_bluetooth_adapter_client.h"
-#include "chromeos/dbus/experimental_bluetooth_agent_manager_client.h"
-#include "chromeos/dbus/experimental_bluetooth_device_client.h"
-#include "chromeos/dbus/experimental_bluetooth_input_client.h"
-#include "chromeos/dbus/experimental_bluetooth_profile_manager_client.h"
 #include "chromeos/dbus/gsm_sms_client.h"
 #include "chromeos/dbus/shill_device_client.h"
 #include "chromeos/dbus/shill_ipconfig_client.h"
@@ -83,6 +83,16 @@ class DBusThreadManagerImpl : public DBusThreadManager {
   // NOTE: Clients that access other clients in their constructor must be
   // construced in the correct order.
   void InitializeClients() {
+    bluetooth_adapter_client_.reset(
+        BluetoothAdapterClient::Create(client_type_, system_bus_.get()));
+    bluetooth_agent_manager_client_.reset(
+        BluetoothAgentManagerClient::Create(client_type_, system_bus_.get()));
+    bluetooth_device_client_.reset(
+        BluetoothDeviceClient::Create(client_type_, system_bus_.get()));
+    bluetooth_input_client_.reset(
+        BluetoothInputClient::Create(client_type_, system_bus_.get()));
+    bluetooth_profile_manager_client_.reset(
+        BluetoothProfileManagerClient::Create(client_type_, system_bus_.get()));
     cras_audio_client_.reset(CrasAudioClient::Create(
         client_type_, system_bus_.get()));
     cros_disks_client_.reset(
@@ -92,22 +102,6 @@ class DBusThreadManagerImpl : public DBusThreadManager {
     debug_daemon_client_.reset(
         DebugDaemonClient::Create(client_type_, system_bus_.get()));
 
-    experimental_bluetooth_adapter_client_.reset(
-        ExperimentalBluetoothAdapterClient::Create(
-            client_type_, system_bus_.get()));
-    experimental_bluetooth_agent_manager_client_.reset(
-        ExperimentalBluetoothAgentManagerClient::Create(
-            client_type_, system_bus_.get()));
-    experimental_bluetooth_device_client_.reset(
-        ExperimentalBluetoothDeviceClient::Create(
-            client_type_, system_bus_.get()));
-    experimental_bluetooth_input_client_.reset(
-        ExperimentalBluetoothInputClient::Create(
-            client_type_, system_bus_.get()));
-    experimental_bluetooth_profile_manager_client_.reset(
-        ExperimentalBluetoothProfileManagerClient::Create(
-            client_type_, system_bus_.get()));
-
     shill_manager_client_.reset(
         ShillManagerClient::Create(client_type_override_, system_bus_.get()));
     shill_device_client_.reset(
@@ -227,45 +221,42 @@ class DBusThreadManagerImpl : public DBusThreadManager {
     return ibus_bus_.get();
   }
 
-  virtual CrasAudioClient* GetCrasAudioClient() OVERRIDE {
-    return cras_audio_client_.get();
+  virtual BluetoothAdapterClient* GetBluetoothAdapterClient() OVERRIDE {
+    return bluetooth_adapter_client_.get();
   }
 
-  virtual CrosDisksClient* GetCrosDisksClient() OVERRIDE {
-    return cros_disks_client_.get();
+  virtual BluetoothAgentManagerClient* GetBluetoothAgentManagerClient()
+      OVERRIDE {
+    return bluetooth_agent_manager_client_.get();
   }
 
-  virtual CryptohomeClient* GetCryptohomeClient() OVERRIDE {
-    return cryptohome_client_.get();
+  virtual BluetoothDeviceClient* GetBluetoothDeviceClient() OVERRIDE {
+    return bluetooth_device_client_.get();
   }
 
-  virtual DebugDaemonClient* GetDebugDaemonClient() OVERRIDE {
-    return debug_daemon_client_.get();
+  virtual BluetoothInputClient* GetBluetoothInputClient() OVERRIDE {
+    return bluetooth_input_client_.get();
   }
 
-  virtual ExperimentalBluetoothAdapterClient*
-        GetExperimentalBluetoothAdapterClient() OVERRIDE {
-    return experimental_bluetooth_adapter_client_.get();
+  virtual BluetoothProfileManagerClient* GetBluetoothProfileManagerClient()
+      OVERRIDE {
+    return bluetooth_profile_manager_client_.get();
   }
 
-  virtual ExperimentalBluetoothAgentManagerClient*
-        GetExperimentalBluetoothAgentManagerClient() OVERRIDE {
-    return experimental_bluetooth_agent_manager_client_.get();
+  virtual CrasAudioClient* GetCrasAudioClient() OVERRIDE {
+    return cras_audio_client_.get();
   }
 
-  virtual ExperimentalBluetoothDeviceClient*
-        GetExperimentalBluetoothDeviceClient() OVERRIDE {
-    return experimental_bluetooth_device_client_.get();
+  virtual CrosDisksClient* GetCrosDisksClient() OVERRIDE {
+    return cros_disks_client_.get();
   }
 
-  virtual ExperimentalBluetoothInputClient*
-        GetExperimentalBluetoothInputClient() OVERRIDE {
-    return experimental_bluetooth_input_client_.get();
+  virtual CryptohomeClient* GetCryptohomeClient() OVERRIDE {
+    return cryptohome_client_.get();
   }
 
-  virtual ExperimentalBluetoothProfileManagerClient*
-        GetExperimentalBluetoothProfileManagerClient() OVERRIDE {
-    return experimental_bluetooth_profile_manager_client_.get();
+  virtual DebugDaemonClient* GetDebugDaemonClient() OVERRIDE {
+    return debug_daemon_client_.get();
   }
 
   virtual ShillDeviceClient* GetShillDeviceClient() OVERRIDE {
@@ -387,20 +378,15 @@ class DBusThreadManagerImpl : public DBusThreadManager {
   scoped_ptr<base::Thread> dbus_thread_;
   scoped_refptr<dbus::Bus> system_bus_;
   scoped_refptr<dbus::Bus> ibus_bus_;
+  scoped_ptr<BluetoothAdapterClient> bluetooth_adapter_client_;
+  scoped_ptr<BluetoothAgentManagerClient> bluetooth_agent_manager_client_;
+  scoped_ptr<BluetoothDeviceClient> bluetooth_device_client_;
+  scoped_ptr<BluetoothInputClient> bluetooth_input_client_;
+  scoped_ptr<BluetoothProfileManagerClient> bluetooth_profile_manager_client_;
   scoped_ptr<CrasAudioClient> cras_audio_client_;
   scoped_ptr<CrosDisksClient> cros_disks_client_;
   scoped_ptr<CryptohomeClient> cryptohome_client_;
   scoped_ptr<DebugDaemonClient> debug_daemon_client_;
-  scoped_ptr<ExperimentalBluetoothAdapterClient>
-      experimental_bluetooth_adapter_client_;
-  scoped_ptr<ExperimentalBluetoothAgentManagerClient>
-      experimental_bluetooth_agent_manager_client_;
-  scoped_ptr<ExperimentalBluetoothDeviceClient>
-      experimental_bluetooth_device_client_;
-  scoped_ptr<ExperimentalBluetoothInputClient>
-      experimental_bluetooth_input_client_;
-  scoped_ptr<ExperimentalBluetoothProfileManagerClient>
-      experimental_bluetooth_profile_manager_client_;
   scoped_ptr<ShillDeviceClient> shill_device_client_;
   scoped_ptr<ShillIPConfigClient> shill_ipconfig_client_;
   scoped_ptr<ShillManagerClient> shill_manager_client_;
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;
diff --git a/chromeos/dbus/fake_bluetooth_adapter_client.cc b/chromeos/dbus/fake_bluetooth_adapter_client.cc
index 695579d..695ccdf 100644
--- a/chromeos/dbus/fake_bluetooth_adapter_client.cc
+++ b/chromeos/dbus/fake_bluetooth_adapter_client.cc
@@ -38,7 +38,7 @@ const char FakeBluetoothAdapterClient::kSecondAdapterAddress[] =
 
 FakeBluetoothAdapterClient::Properties::Properties(
     const PropertyChangedCallback& callback)
-    : ExperimentalBluetoothAdapterClient::Properties(
+    : BluetoothAdapterClient::Properties(
         NULL,
         bluetooth_adapter::kBluetoothAdapterInterface,
         callback) {
@@ -143,7 +143,7 @@ void FakeBluetoothAdapterClient::StartDiscovery(
 
     FakeBluetoothDeviceClient* device_client =
         static_cast<FakeBluetoothDeviceClient*>(
-            DBusThreadManager::Get()->GetExperimentalBluetoothDeviceClient());
+            DBusThreadManager::Get()->GetBluetoothDeviceClient());
     device_client->BeginDiscoverySimulation(dbus::ObjectPath(kAdapterPath));
   }
 }
@@ -171,7 +171,7 @@ void FakeBluetoothAdapterClient::StopDiscovery(
   if (discovering_count_ == 0) {
     FakeBluetoothDeviceClient* device_client =
         static_cast<FakeBluetoothDeviceClient*>(
-            DBusThreadManager::Get()->GetExperimentalBluetoothDeviceClient());
+            DBusThreadManager::Get()->GetBluetoothDeviceClient());
     device_client->EndDiscoverySimulation(dbus::ObjectPath(kAdapterPath));
 
     properties_->discovering.ReplaceValue(false);
@@ -194,7 +194,7 @@ void FakeBluetoothAdapterClient::RemoveDevice(
 
   FakeBluetoothDeviceClient* device_client =
       static_cast<FakeBluetoothDeviceClient*>(
-          DBusThreadManager::Get()->GetExperimentalBluetoothDeviceClient());
+          DBusThreadManager::Get()->GetBluetoothDeviceClient());
   device_client->RemoveDevice(dbus::ObjectPath(kAdapterPath), device_path);
 }
 
@@ -204,14 +204,14 @@ void FakeBluetoothAdapterClient::SetVisible(
     // Adapter becoming visible
     visible_ = visible;
 
-    FOR_EACH_OBSERVER(ExperimentalBluetoothAdapterClient::Observer, observers_,
+    FOR_EACH_OBSERVER(BluetoothAdapterClient::Observer, observers_,
                       AdapterAdded(dbus::ObjectPath(kAdapterPath)));
 
   } else if (visible_ && !visible) {
     // Adapter becoming invisible
     visible_ = visible;
 
-    FOR_EACH_OBSERVER(ExperimentalBluetoothAdapterClient::Observer, observers_,
+    FOR_EACH_OBSERVER(BluetoothAdapterClient::Observer, observers_,
                       AdapterRemoved(dbus::ObjectPath(kAdapterPath)));
   }
 }
@@ -222,14 +222,14 @@ void FakeBluetoothAdapterClient::SetSecondVisible(
     // Second adapter becoming visible
     second_visible_ = visible;
 
-    FOR_EACH_OBSERVER(ExperimentalBluetoothAdapterClient::Observer, observers_,
+    FOR_EACH_OBSERVER(BluetoothAdapterClient::Observer, observers_,
                       AdapterAdded(dbus::ObjectPath(kSecondAdapterPath)));
 
   } else if (second_visible_ && !visible) {
     // Second adapter becoming invisible
     second_visible_ = visible;
 
-    FOR_EACH_OBSERVER(ExperimentalBluetoothAdapterClient::Observer, observers_,
+    FOR_EACH_OBSERVER(BluetoothAdapterClient::Observer, observers_,
                       AdapterRemoved(dbus::ObjectPath(kSecondAdapterPath)));
   }
 }
@@ -246,7 +246,7 @@ void FakeBluetoothAdapterClient::OnPropertyChanged(
     }
   }
 
-  FOR_EACH_OBSERVER(ExperimentalBluetoothAdapterClient::Observer, observers_,
+  FOR_EACH_OBSERVER(BluetoothAdapterClient::Observer, observers_,
                     AdapterPropertyChanged(dbus::ObjectPath(kAdapterPath),
                                            property_name));
 }
diff --git a/chromeos/dbus/fake_bluetooth_adapter_client.h b/chromeos/dbus/fake_bluetooth_adapter_client.h
index 96fa426..6eb994a 100644
--- a/chromeos/dbus/fake_bluetooth_adapter_client.h
+++ b/chromeos/dbus/fake_bluetooth_adapter_client.h
@@ -11,8 +11,8 @@
 #include "base/callback.h"
 #include "base/observer_list.h"
 #include "chromeos/chromeos_export.h"
+#include "chromeos/dbus/bluetooth_adapter_client.h"
 #include "chromeos/dbus/dbus_client_implementation_type.h"
-#include "chromeos/dbus/experimental_bluetooth_adapter_client.h"
 #include "dbus/object_path.h"
 #include "dbus/property.h"
 
@@ -22,9 +22,9 @@ namespace chromeos {
 // adapter objects and is used both in test cases in place of a mock and on
 // the Linux desktop.
 class CHROMEOS_EXPORT FakeBluetoothAdapterClient
-    : public ExperimentalBluetoothAdapterClient {
+    : public BluetoothAdapterClient {
  public:
-  struct Properties : public ExperimentalBluetoothAdapterClient::Properties {
+  struct Properties : public BluetoothAdapterClient::Properties {
     explicit Properties(const PropertyChangedCallback & callback);
     virtual ~Properties();
 
@@ -39,7 +39,7 @@ class CHROMEOS_EXPORT FakeBluetoothAdapterClient
   FakeBluetoothAdapterClient();
   virtual ~FakeBluetoothAdapterClient();
 
-  // ExperimentalBluetoothAdapterClient override
+  // BluetoothAdapterClient override
   virtual void AddObserver(Observer* observer) OVERRIDE;
   virtual void RemoveObserver(Observer* observer) OVERRIDE;
   virtual std::vector<dbus::ObjectPath> GetAdapters() OVERRIDE;
diff --git a/chromeos/dbus/fake_bluetooth_agent_manager_client.h b/chromeos/dbus/fake_bluetooth_agent_manager_client.h
index 57ecd50..315fd5e 100644
--- a/chromeos/dbus/fake_bluetooth_agent_manager_client.h
+++ b/chromeos/dbus/fake_bluetooth_agent_manager_client.h
@@ -9,8 +9,8 @@
 #include "base/callback.h"
 #include "base/observer_list.h"
 #include "chromeos/chromeos_export.h"
+#include "chromeos/dbus/bluetooth_agent_manager_client.h"
 #include "chromeos/dbus/dbus_client_implementation_type.h"
-#include "chromeos/dbus/experimental_bluetooth_agent_manager_client.h"
 #include "dbus/object_path.h"
 #include "dbus/property.h"
 
@@ -22,12 +22,12 @@ class FakeBluetoothAgentServiceProvider;
 // Daemon's agent manager object and is used both in test cases in place of a
 // mock and on the Linux desktop.
 class CHROMEOS_EXPORT FakeBluetoothAgentManagerClient
-    : public ExperimentalBluetoothAgentManagerClient {
+    : public BluetoothAgentManagerClient {
  public:
   FakeBluetoothAgentManagerClient();
   virtual ~FakeBluetoothAgentManagerClient();
 
-  // ExperimentalBluetoothAgentManagerClient override
+  // BluetoothAgentManagerClient override
   virtual void RegisterAgent(const dbus::ObjectPath& agent_path,
                              const std::string& capability,
                              const base::Closure& callback,
diff --git a/chromeos/dbus/fake_bluetooth_agent_service_provider.cc b/chromeos/dbus/fake_bluetooth_agent_service_provider.cc
index 16ba3c0..3948c3c 100644
--- a/chromeos/dbus/fake_bluetooth_agent_service_provider.cc
+++ b/chromeos/dbus/fake_bluetooth_agent_service_provider.cc
@@ -19,8 +19,7 @@ FakeBluetoothAgentServiceProvider::FakeBluetoothAgentServiceProvider(
 
   FakeBluetoothAgentManagerClient* fake_bluetooth_agent_manager_client =
       static_cast<FakeBluetoothAgentManagerClient*>(
-          DBusThreadManager::Get()->
-              GetExperimentalBluetoothAgentManagerClient());
+          DBusThreadManager::Get()->GetBluetoothAgentManagerClient());
   fake_bluetooth_agent_manager_client->RegisterAgentServiceProvider(this);
 }
 
@@ -29,8 +28,7 @@ FakeBluetoothAgentServiceProvider::~FakeBluetoothAgentServiceProvider() {
 
   FakeBluetoothAgentManagerClient* fake_bluetooth_agent_manager_client =
       static_cast<FakeBluetoothAgentManagerClient*>(
-          DBusThreadManager::Get()->
-              GetExperimentalBluetoothAgentManagerClient());
+          DBusThreadManager::Get()->GetBluetoothAgentManagerClient());
   fake_bluetooth_agent_manager_client->UnregisterAgentServiceProvider(this);
 }
 
diff --git a/chromeos/dbus/fake_bluetooth_agent_service_provider.h b/chromeos/dbus/fake_bluetooth_agent_service_provider.h
index 9e931a5..82a401b 100644
--- a/chromeos/dbus/fake_bluetooth_agent_service_provider.h
+++ b/chromeos/dbus/fake_bluetooth_agent_service_provider.h
@@ -9,8 +9,8 @@
 #include "base/callback.h"
 #include "base/observer_list.h"
 #include "chromeos/chromeos_export.h"
+#include "chromeos/dbus/bluetooth_agent_service_provider.h"
 #include "chromeos/dbus/dbus_client_implementation_type.h"
-#include "chromeos/dbus/experimental_bluetooth_agent_service_provider.h"
 #include "dbus/object_path.h"
 #include "dbus/property.h"
 
@@ -22,7 +22,7 @@ class FakeBluetoothAgentManagerClient;
 // Bluetooth agent object and is used both in test cases in place of a
 // mock and on the Linux desktop.
 class CHROMEOS_EXPORT FakeBluetoothAgentServiceProvider
-    : public ExperimentalBluetoothAgentServiceProvider {
+    : public BluetoothAgentServiceProvider {
  public:
   FakeBluetoothAgentServiceProvider(const dbus::ObjectPath& object_path,
                                     Delegate *delegate);
diff --git a/chromeos/dbus/fake_bluetooth_device_client.cc b/chromeos/dbus/fake_bluetooth_device_client.cc
index 124cd73..ed37c2f 100644
--- a/chromeos/dbus/fake_bluetooth_device_client.cc
+++ b/chromeos/dbus/fake_bluetooth_device_client.cc
@@ -156,7 +156,7 @@ const uint32 FakeBluetoothDeviceClient::kUnpairableDeviceClass = 0x002540;
 
 FakeBluetoothDeviceClient::Properties::Properties(
     const PropertyChangedCallback& callback)
-    : ExperimentalBluetoothDeviceClient::Properties(
+    : BluetoothDeviceClient::Properties(
           NULL,
           bluetooth_device::kBluetoothDeviceInterface,
           callback) {
@@ -304,8 +304,7 @@ void FakeBluetoothDeviceClient::ConnectProfile(
 
   FakeBluetoothProfileManagerClient* fake_bluetooth_profile_manager_client =
       static_cast<FakeBluetoothProfileManagerClient*>(
-          DBusThreadManager::Get()->
-              GetExperimentalBluetoothProfileManagerClient());
+          DBusThreadManager::Get()->GetBluetoothProfileManagerClient());
   FakeBluetoothProfileServiceProvider* profile_service_provider =
       fake_bluetooth_profile_manager_client->GetProfileServiceProvider(uuid);
   if (profile_service_provider == NULL) {
@@ -347,7 +346,7 @@ void FakeBluetoothDeviceClient::ConnectProfile(
   scoped_ptr<dbus::FileDescriptor> fd(new dbus::FileDescriptor(fds[1]));
 
   // Post the new connection to the service provider.
-  ExperimentalBluetoothProfileServiceProvider::Delegate::Options options;
+  BluetoothProfileServiceProvider::Delegate::Options options;
 
   profile_service_provider->NewConnection(
       object_path,
@@ -369,8 +368,7 @@ void FakeBluetoothDeviceClient::DisconnectProfile(
 
   FakeBluetoothProfileManagerClient* fake_bluetooth_profile_manager_client =
       static_cast<FakeBluetoothProfileManagerClient*>(
-          DBusThreadManager::Get()->
-              GetExperimentalBluetoothProfileManagerClient());
+          DBusThreadManager::Get()->GetBluetoothProfileManagerClient());
   FakeBluetoothProfileServiceProvider* profile_service_provider =
       fake_bluetooth_profile_manager_client->GetProfileServiceProvider(uuid);
   if (profile_service_provider == NULL) {
@@ -404,8 +402,7 @@ void FakeBluetoothDeviceClient::Pair(
 
   FakeBluetoothAgentManagerClient* fake_bluetooth_agent_manager_client =
       static_cast<FakeBluetoothAgentManagerClient*>(
-          DBusThreadManager::Get()->
-              GetExperimentalBluetoothAgentManagerClient());
+          DBusThreadManager::Get()->GetBluetoothAgentManagerClient());
   FakeBluetoothAgentServiceProvider* agent_service_provider =
       fake_bluetooth_agent_manager_client->GetAgentServiceProvider();
   if (agent_service_provider == NULL) {
@@ -550,15 +547,14 @@ void FakeBluetoothDeviceClient::RemoveDevice(
   device_list_.erase(listiter);
 
   // Remove the Input interface if it exists. This should be called before the
-  // ExperimentalBluetoothDeviceClient::Observer::DeviceRemoved because it
-  // deletes the BluetoothDeviceExperimentalChromeOS object, including the
-  // device_path referenced here.
+  // BluetoothDeviceClient::Observer::DeviceRemoved because it deletes the
+  // BluetoothDeviceChromeOS object, including the device_path referenced here.
   FakeBluetoothInputClient* fake_bluetooth_input_client =
       static_cast<FakeBluetoothInputClient*>(
-          DBusThreadManager::Get()->GetExperimentalBluetoothInputClient());
+          DBusThreadManager::Get()->GetBluetoothInputClient());
   fake_bluetooth_input_client->RemoveInputDevice(device_path);
 
-  FOR_EACH_OBSERVER(ExperimentalBluetoothDeviceClient::Observer, observers_,
+  FOR_EACH_OBSERVER(BluetoothDeviceClient::Observer, observers_,
                     DeviceRemoved(device_path));
 
   delete properties;
@@ -568,7 +564,7 @@ void FakeBluetoothDeviceClient::RemoveDevice(
 void FakeBluetoothDeviceClient::OnPropertyChanged(
     const dbus::ObjectPath& object_path,
     const std::string& property_name) {
-  FOR_EACH_OBSERVER(ExperimentalBluetoothDeviceClient::Observer, observers_,
+  FOR_EACH_OBSERVER(BluetoothDeviceClient::Observer, observers_,
                     DevicePropertyChanged(object_path, property_name));
 }
 
@@ -599,7 +595,7 @@ void FakeBluetoothDeviceClient::DiscoverySimulationTimer() {
 
       properties_map_[dbus::ObjectPath(kAppleMousePath)] = properties;
       device_list_.push_back(dbus::ObjectPath(kAppleMousePath));
-      FOR_EACH_OBSERVER(ExperimentalBluetoothDeviceClient::Observer, observers_,
+      FOR_EACH_OBSERVER(BluetoothDeviceClient::Observer, observers_,
                         DeviceAdded(dbus::ObjectPath(kAppleMousePath)));
     }
 
@@ -623,7 +619,7 @@ void FakeBluetoothDeviceClient::DiscoverySimulationTimer() {
 
       properties_map_[dbus::ObjectPath(kAppleKeyboardPath)] = properties;
       device_list_.push_back(dbus::ObjectPath(kAppleKeyboardPath));
-      FOR_EACH_OBSERVER(ExperimentalBluetoothDeviceClient::Observer, observers_,
+      FOR_EACH_OBSERVER(BluetoothDeviceClient::Observer, observers_,
                         DeviceAdded(dbus::ObjectPath(kAppleKeyboardPath)));
     }
 
@@ -643,7 +639,7 @@ void FakeBluetoothDeviceClient::DiscoverySimulationTimer() {
 
       properties_map_[dbus::ObjectPath(kVanishingDevicePath)] = properties;
       device_list_.push_back(dbus::ObjectPath(kVanishingDevicePath));
-      FOR_EACH_OBSERVER(ExperimentalBluetoothDeviceClient::Observer, observers_,
+      FOR_EACH_OBSERVER(BluetoothDeviceClient::Observer, observers_,
                         DeviceAdded(dbus::ObjectPath(kVanishingDevicePath)));
     }
 
@@ -668,7 +664,7 @@ void FakeBluetoothDeviceClient::DiscoverySimulationTimer() {
 
       properties_map_[dbus::ObjectPath(kMicrosoftMousePath)] = properties;
       device_list_.push_back(dbus::ObjectPath(kMicrosoftMousePath));
-      FOR_EACH_OBSERVER(ExperimentalBluetoothDeviceClient::Observer, observers_,
+      FOR_EACH_OBSERVER(BluetoothDeviceClient::Observer, observers_,
                         DeviceAdded(dbus::ObjectPath(kMicrosoftMousePath)));
     }
 
@@ -693,7 +689,7 @@ void FakeBluetoothDeviceClient::DiscoverySimulationTimer() {
 
       properties_map_[dbus::ObjectPath(kMotorolaKeyboardPath)] = properties;
       device_list_.push_back(dbus::ObjectPath(kMotorolaKeyboardPath));
-      FOR_EACH_OBSERVER(ExperimentalBluetoothDeviceClient::Observer, observers_,
+      FOR_EACH_OBSERVER(BluetoothDeviceClient::Observer, observers_,
                         DeviceAdded(dbus::ObjectPath(kMotorolaKeyboardPath)));
     }
 
@@ -713,7 +709,7 @@ void FakeBluetoothDeviceClient::DiscoverySimulationTimer() {
 
       properties_map_[dbus::ObjectPath(kSonyHeadphonesPath)] = properties;
       device_list_.push_back(dbus::ObjectPath(kSonyHeadphonesPath));
-      FOR_EACH_OBSERVER(ExperimentalBluetoothDeviceClient::Observer, observers_,
+      FOR_EACH_OBSERVER(BluetoothDeviceClient::Observer, observers_,
                         DeviceAdded(dbus::ObjectPath(kSonyHeadphonesPath)));
     }
 
@@ -733,7 +729,7 @@ void FakeBluetoothDeviceClient::DiscoverySimulationTimer() {
 
       properties_map_[dbus::ObjectPath(kPhonePath)] = properties;
       device_list_.push_back(dbus::ObjectPath(kPhonePath));
-      FOR_EACH_OBSERVER(ExperimentalBluetoothDeviceClient::Observer, observers_,
+      FOR_EACH_OBSERVER(BluetoothDeviceClient::Observer, observers_,
                         DeviceAdded(dbus::ObjectPath(kPhonePath)));
     }
 
@@ -752,7 +748,7 @@ void FakeBluetoothDeviceClient::DiscoverySimulationTimer() {
 
       properties_map_[dbus::ObjectPath(kWeirdDevicePath)] = properties;
       device_list_.push_back(dbus::ObjectPath(kWeirdDevicePath));
-      FOR_EACH_OBSERVER(ExperimentalBluetoothDeviceClient::Observer, observers_,
+      FOR_EACH_OBSERVER(BluetoothDeviceClient::Observer, observers_,
                         DeviceAdded(dbus::ObjectPath(kWeirdDevicePath)));
     }
 
@@ -773,7 +769,7 @@ void FakeBluetoothDeviceClient::DiscoverySimulationTimer() {
       properties_map_[dbus::ObjectPath(kUnconnectableDevicePath)] = properties;
       device_list_.push_back(dbus::ObjectPath(kUnconnectableDevicePath));
       FOR_EACH_OBSERVER(
-          ExperimentalBluetoothDeviceClient::Observer, observers_,
+          BluetoothDeviceClient::Observer, observers_,
           DeviceAdded(dbus::ObjectPath(kUnconnectableDevicePath)));
     }
 
@@ -793,9 +789,8 @@ void FakeBluetoothDeviceClient::DiscoverySimulationTimer() {
 
       properties_map_[dbus::ObjectPath(kUnpairableDevicePath)] = properties;
       device_list_.push_back(dbus::ObjectPath(kUnpairableDevicePath));
-      FOR_EACH_OBSERVER(
-          ExperimentalBluetoothDeviceClient::Observer, observers_,
-          DeviceAdded(dbus::ObjectPath(kUnpairableDevicePath)));
+      FOR_EACH_OBSERVER(BluetoothDeviceClient::Observer, observers_,
+                        DeviceAdded(dbus::ObjectPath(kUnpairableDevicePath)));
     }
 
   } else if (discovery_simulation_step_ == 13) {
@@ -878,7 +873,7 @@ void FakeBluetoothDeviceClient::AddInputDeviceIfNeeded(
   // simulate the Input interface.
   FakeBluetoothInputClient* fake_bluetooth_input_client =
       static_cast<FakeBluetoothInputClient*>(
-          DBusThreadManager::Get()->GetExperimentalBluetoothInputClient());
+          DBusThreadManager::Get()->GetBluetoothInputClient());
 
   if ((properties->bluetooth_class.value() & 0x001f03) == 0x000500)
     fake_bluetooth_input_client->AddInputDevice(object_path);
@@ -888,11 +883,11 @@ void FakeBluetoothDeviceClient::PinCodeCallback(
     const dbus::ObjectPath& object_path,
     const base::Closure& callback,
     const ErrorCallback& error_callback,
-    ExperimentalBluetoothAgentServiceProvider::Delegate::Status status,
+    BluetoothAgentServiceProvider::Delegate::Status status,
     const std::string& pincode) {
   VLOG(1) << "PinCodeCallback: " << object_path.value();
 
-  if (status == ExperimentalBluetoothAgentServiceProvider::Delegate::SUCCESS) {
+  if (status == BluetoothAgentServiceProvider::Delegate::SUCCESS) {
     base::MessageLoop::current()->PostDelayedTask(
         FROM_HERE,
         base::Bind(&FakeBluetoothDeviceClient::CompleteSimulatedPairing,
@@ -900,8 +895,7 @@ void FakeBluetoothDeviceClient::PinCodeCallback(
                    object_path, callback, error_callback),
         base::TimeDelta::FromMilliseconds(3 * simulation_interval_ms_));
 
-  } else if (status ==
-             ExperimentalBluetoothAgentServiceProvider::Delegate::CANCELLED) {
+  } else if (status == BluetoothAgentServiceProvider::Delegate::CANCELLED) {
     base::MessageLoop::current()->PostDelayedTask(
         FROM_HERE,
         base::Bind(&FakeBluetoothDeviceClient::CancelSimulatedPairing,
@@ -909,8 +903,7 @@ void FakeBluetoothDeviceClient::PinCodeCallback(
                    object_path, error_callback),
         base::TimeDelta::FromMilliseconds(simulation_interval_ms_));
 
-  } else if (status ==
-             ExperimentalBluetoothAgentServiceProvider::Delegate::REJECTED) {
+  } else if (status == BluetoothAgentServiceProvider::Delegate::REJECTED) {
     base::MessageLoop::current()->PostDelayedTask(
         FROM_HERE,
         base::Bind(&FakeBluetoothDeviceClient::RejectSimulatedPairing,
@@ -925,11 +918,11 @@ void FakeBluetoothDeviceClient::PasskeyCallback(
     const dbus::ObjectPath& object_path,
     const base::Closure& callback,
     const ErrorCallback& error_callback,
-    ExperimentalBluetoothAgentServiceProvider::Delegate::Status status,
+    BluetoothAgentServiceProvider::Delegate::Status status,
     uint32 passkey) {
   VLOG(1) << "PasskeyCallback: " << object_path.value();
 
-  if (status == ExperimentalBluetoothAgentServiceProvider::Delegate::SUCCESS) {
+  if (status == BluetoothAgentServiceProvider::Delegate::SUCCESS) {
     base::MessageLoop::current()->PostDelayedTask(
         FROM_HERE,
         base::Bind(&FakeBluetoothDeviceClient::CompleteSimulatedPairing,
@@ -937,8 +930,7 @@ void FakeBluetoothDeviceClient::PasskeyCallback(
                    object_path, callback, error_callback),
         base::TimeDelta::FromMilliseconds(3 * simulation_interval_ms_));
 
-  } else if (status ==
-             ExperimentalBluetoothAgentServiceProvider::Delegate::CANCELLED) {
+  } else if (status == BluetoothAgentServiceProvider::Delegate::CANCELLED) {
     base::MessageLoop::current()->PostDelayedTask(
         FROM_HERE,
         base::Bind(&FakeBluetoothDeviceClient::CancelSimulatedPairing,
@@ -946,8 +938,7 @@ void FakeBluetoothDeviceClient::PasskeyCallback(
                    object_path, error_callback),
         base::TimeDelta::FromMilliseconds(simulation_interval_ms_));
 
-  } else if (status ==
-             ExperimentalBluetoothAgentServiceProvider::Delegate::REJECTED) {
+  } else if (status == BluetoothAgentServiceProvider::Delegate::REJECTED) {
     base::MessageLoop::current()->PostDelayedTask(
         FROM_HERE,
         base::Bind(&FakeBluetoothDeviceClient::RejectSimulatedPairing,
@@ -962,10 +953,10 @@ void FakeBluetoothDeviceClient::ConfirmationCallback(
     const dbus::ObjectPath& object_path,
     const base::Closure& callback,
     const ErrorCallback& error_callback,
-    ExperimentalBluetoothAgentServiceProvider::Delegate::Status status) {
+    BluetoothAgentServiceProvider::Delegate::Status status) {
   VLOG(1) << "ConfirmationCallback: " << object_path.value();
 
-  if (status == ExperimentalBluetoothAgentServiceProvider::Delegate::SUCCESS) {
+  if (status == BluetoothAgentServiceProvider::Delegate::SUCCESS) {
     base::MessageLoop::current()->PostDelayedTask(
         FROM_HERE,
         base::Bind(&FakeBluetoothDeviceClient::CompleteSimulatedPairing,
@@ -973,8 +964,7 @@ void FakeBluetoothDeviceClient::ConfirmationCallback(
                    object_path, callback, error_callback),
         base::TimeDelta::FromMilliseconds(3 * simulation_interval_ms_));
 
-  } else if (status ==
-             ExperimentalBluetoothAgentServiceProvider::Delegate::CANCELLED) {
+  } else if (status == BluetoothAgentServiceProvider::Delegate::CANCELLED) {
     base::MessageLoop::current()->PostDelayedTask(
         FROM_HERE,
         base::Bind(&FakeBluetoothDeviceClient::CancelSimulatedPairing,
@@ -982,8 +972,7 @@ void FakeBluetoothDeviceClient::ConfirmationCallback(
                    object_path, error_callback),
         base::TimeDelta::FromMilliseconds(simulation_interval_ms_));
 
-  } else if (status ==
-             ExperimentalBluetoothAgentServiceProvider::Delegate::REJECTED) {
+  } else if (status == BluetoothAgentServiceProvider::Delegate::REJECTED) {
     base::MessageLoop::current()->PostDelayedTask(
         FROM_HERE,
         base::Bind(&FakeBluetoothDeviceClient::RejectSimulatedPairing,
@@ -1003,8 +992,7 @@ void FakeBluetoothDeviceClient::SimulateKeypress(
 
   FakeBluetoothAgentManagerClient* fake_bluetooth_agent_manager_client =
       static_cast<FakeBluetoothAgentManagerClient*>(
-          DBusThreadManager::Get()->
-              GetExperimentalBluetoothAgentManagerClient());
+          DBusThreadManager::Get()->GetBluetoothAgentManagerClient());
   FakeBluetoothAgentServiceProvider* agent_service_provider =
       fake_bluetooth_agent_manager_client->GetAgentServiceProvider();
   agent_service_provider->DisplayPasskey(object_path, 123456, entered);
@@ -1032,18 +1020,15 @@ void FakeBluetoothDeviceClient::ConnectionCallback(
     const dbus::ObjectPath& object_path,
     const base::Closure& callback,
     const ErrorCallback& error_callback,
-    ExperimentalBluetoothProfileServiceProvider::Delegate::Status status) {
+    BluetoothProfileServiceProvider::Delegate::Status status) {
   VLOG(1) << "ConnectionCallback: " << object_path.value();
 
-  if (status ==
-      ExperimentalBluetoothProfileServiceProvider::Delegate::SUCCESS) {
+  if (status == BluetoothProfileServiceProvider::Delegate::SUCCESS) {
     callback.Run();
-  } else if (status ==
-             ExperimentalBluetoothProfileServiceProvider::Delegate::CANCELLED) {
+  } else if (status == BluetoothProfileServiceProvider::Delegate::CANCELLED) {
     // TODO(keybuk): tear down this side of the connection
     error_callback.Run(bluetooth_device::kErrorFailed, "Canceled");
-  } else if (status ==
-             ExperimentalBluetoothProfileServiceProvider::Delegate::REJECTED) {
+  } else if (status == BluetoothProfileServiceProvider::Delegate::REJECTED) {
     // TODO(keybuk): tear down this side of the connection
     error_callback.Run(bluetooth_device::kErrorFailed, "Rejected");
   }
@@ -1053,18 +1038,15 @@ void FakeBluetoothDeviceClient::DisconnectionCallback(
     const dbus::ObjectPath& object_path,
     const base::Closure& callback,
     const ErrorCallback& error_callback,
-    ExperimentalBluetoothProfileServiceProvider::Delegate::Status status) {
+    BluetoothProfileServiceProvider::Delegate::Status status) {
   VLOG(1) << "DisconnectionCallback: " << object_path.value();
 
-  if (status ==
-      ExperimentalBluetoothProfileServiceProvider::Delegate::SUCCESS) {
+  if (status == BluetoothProfileServiceProvider::Delegate::SUCCESS) {
     // TODO(keybuk): tear down this side of the connection
     callback.Run();
-  } else if (status ==
-             ExperimentalBluetoothProfileServiceProvider::Delegate::CANCELLED) {
+  } else if (status == BluetoothProfileServiceProvider::Delegate::CANCELLED) {
     error_callback.Run(bluetooth_device::kErrorFailed, "Canceled");
-  } else if (status ==
-             ExperimentalBluetoothProfileServiceProvider::Delegate::REJECTED) {
+  } else if (status == BluetoothProfileServiceProvider::Delegate::REJECTED) {
     error_callback.Run(bluetooth_device::kErrorFailed, "Rejected");
   }
 }
diff --git a/chromeos/dbus/fake_bluetooth_device_client.h b/chromeos/dbus/fake_bluetooth_device_client.h
index 6a90863..e5cfc51 100644
--- a/chromeos/dbus/fake_bluetooth_device_client.h
+++ b/chromeos/dbus/fake_bluetooth_device_client.h
@@ -12,10 +12,10 @@
 #include "base/callback.h"
 #include "base/observer_list.h"
 #include "chromeos/chromeos_export.h"
+#include "chromeos/dbus/bluetooth_agent_service_provider.h"
+#include "chromeos/dbus/bluetooth_device_client.h"
+#include "chromeos/dbus/bluetooth_profile_service_provider.h"
 #include "chromeos/dbus/dbus_client_implementation_type.h"
-#include "chromeos/dbus/experimental_bluetooth_agent_service_provider.h"
-#include "chromeos/dbus/experimental_bluetooth_device_client.h"
-#include "chromeos/dbus/experimental_bluetooth_profile_service_provider.h"
 #include "dbus/object_path.h"
 #include "dbus/property.h"
 
@@ -25,9 +25,9 @@ namespace chromeos {
 // device objects and is used both in test cases in place of a mock and on
 // the Linux desktop.
 class CHROMEOS_EXPORT FakeBluetoothDeviceClient
-    : public ExperimentalBluetoothDeviceClient {
+    : public BluetoothDeviceClient {
  public:
-  struct Properties : public ExperimentalBluetoothDeviceClient::Properties {
+  struct Properties : public BluetoothDeviceClient::Properties {
     explicit Properties(const PropertyChangedCallback & callback);
     virtual ~Properties();
 
@@ -42,7 +42,7 @@ class CHROMEOS_EXPORT FakeBluetoothDeviceClient
   FakeBluetoothDeviceClient();
   virtual ~FakeBluetoothDeviceClient();
 
-  // ExperimentalBluetoothDeviceClient override
+  // BluetoothDeviceClient override
   virtual void AddObserver(Observer* observer) OVERRIDE;
   virtual void RemoveObserver(Observer* observer) OVERRIDE;
   virtual std::vector<dbus::ObjectPath> GetDevicesForAdapter(
@@ -168,19 +168,19 @@ class CHROMEOS_EXPORT FakeBluetoothDeviceClient
       const dbus::ObjectPath& object_path,
       const base::Closure& callback,
       const ErrorCallback& error_callback,
-      ExperimentalBluetoothAgentServiceProvider::Delegate::Status status,
+      BluetoothAgentServiceProvider::Delegate::Status status,
       const std::string& pincode);
   void PasskeyCallback(
       const dbus::ObjectPath& object_path,
       const base::Closure& callback,
       const ErrorCallback& error_callback,
-      ExperimentalBluetoothAgentServiceProvider::Delegate::Status status,
+      BluetoothAgentServiceProvider::Delegate::Status status,
       uint32 passkey);
   void ConfirmationCallback(
       const dbus::ObjectPath& object_path,
       const base::Closure& callback,
       const ErrorCallback& error_callback,
-      ExperimentalBluetoothAgentServiceProvider::Delegate::Status status);
+      BluetoothAgentServiceProvider::Delegate::Status status);
   void SimulateKeypress(
       uint16 entered,
       const dbus::ObjectPath& object_path,
@@ -191,12 +191,12 @@ class CHROMEOS_EXPORT FakeBluetoothDeviceClient
       const dbus::ObjectPath& object_path,
       const base::Closure& callback,
       const ErrorCallback& error_callback,
-      ExperimentalBluetoothProfileServiceProvider::Delegate::Status status);
+      BluetoothProfileServiceProvider::Delegate::Status status);
   void DisconnectionCallback(
       const dbus::ObjectPath& object_path,
       const base::Closure& callback,
       const ErrorCallback& error_callback,
-      ExperimentalBluetoothProfileServiceProvider::Delegate::Status status);
+      BluetoothProfileServiceProvider::Delegate::Status status);
 
   // List of observers interested in event notifications from us.
   ObserverList<Observer> observers_;
diff --git a/chromeos/dbus/fake_bluetooth_input_client.cc b/chromeos/dbus/fake_bluetooth_input_client.cc
index bb3523e..717df07 100644
--- a/chromeos/dbus/fake_bluetooth_input_client.cc
+++ b/chromeos/dbus/fake_bluetooth_input_client.cc
@@ -20,7 +20,7 @@ namespace chromeos {
 
 FakeBluetoothInputClient::Properties::Properties(
     const PropertyChangedCallback& callback)
-    : ExperimentalBluetoothInputClient::Properties(
+    : BluetoothInputClient::Properties(
           NULL,
           bluetooth_input::kBluetoothInputInterface,
           callback) {
@@ -95,7 +95,7 @@ void FakeBluetoothInputClient::AddInputDevice(
 
   properties_map_[object_path] = properties;
 
-  FOR_EACH_OBSERVER(ExperimentalBluetoothInputClient::Observer, observers_,
+  FOR_EACH_OBSERVER(BluetoothInputClient::Observer, observers_,
                     InputAdded(object_path));
 }
 
@@ -106,7 +106,7 @@ void FakeBluetoothInputClient::RemoveInputDevice(
   if (it == properties_map_.end())
     return;
 
-  FOR_EACH_OBSERVER(ExperimentalBluetoothInputClient::Observer, observers_,
+  FOR_EACH_OBSERVER(BluetoothInputClient::Observer, observers_,
                     InputRemoved(object_path));
 
   delete it->second;
@@ -116,7 +116,7 @@ void FakeBluetoothInputClient::RemoveInputDevice(
 void FakeBluetoothInputClient::OnPropertyChanged(
     const dbus::ObjectPath& object_path,
     const std::string& property_name) {
-  FOR_EACH_OBSERVER(ExperimentalBluetoothInputClient::Observer, observers_,
+  FOR_EACH_OBSERVER(BluetoothInputClient::Observer, observers_,
                     InputPropertyChanged(object_path, property_name));
 }
 
diff --git a/chromeos/dbus/fake_bluetooth_input_client.h b/chromeos/dbus/fake_bluetooth_input_client.h
index 103e57d..8152668 100644
--- a/chromeos/dbus/fake_bluetooth_input_client.h
+++ b/chromeos/dbus/fake_bluetooth_input_client.h
@@ -8,8 +8,8 @@
 #include "base/callback.h"
 #include "base/observer_list.h"
 #include "chromeos/chromeos_export.h"
+#include "chromeos/dbus/bluetooth_input_client.h"
 #include "chromeos/dbus/dbus_client_implementation_type.h"
-#include "chromeos/dbus/experimental_bluetooth_input_client.h"
 #include "dbus/object_path.h"
 #include "dbus/property.h"
 
@@ -19,9 +19,9 @@ namespace chromeos {
 // input device objects and is used both in test cases in place of a mock and on
 // the Linux desktop.
 class CHROMEOS_EXPORT FakeBluetoothInputClient
-    : public ExperimentalBluetoothInputClient {
+    : public BluetoothInputClient {
  public:
-  struct Properties : public ExperimentalBluetoothInputClient::Properties {
+  struct Properties : public BluetoothInputClient::Properties {
     explicit Properties(const PropertyChangedCallback & callback);
     virtual ~Properties();
 
@@ -36,7 +36,7 @@ class CHROMEOS_EXPORT FakeBluetoothInputClient
   FakeBluetoothInputClient();
   virtual ~FakeBluetoothInputClient();
 
-  // ExperimentalBluetoothInputClient override
+  // BluetoothInputClient override
   virtual void AddObserver(Observer* observer) OVERRIDE;
   virtual void RemoveObserver(Observer* observer) OVERRIDE;
   virtual Properties* GetProperties(const dbus::ObjectPath& object_path)
diff --git a/chromeos/dbus/fake_bluetooth_profile_manager_client.h b/chromeos/dbus/fake_bluetooth_profile_manager_client.h
index bba6732..8bfeaaf 100644
--- a/chromeos/dbus/fake_bluetooth_profile_manager_client.h
+++ b/chromeos/dbus/fake_bluetooth_profile_manager_client.h
@@ -12,8 +12,8 @@
 #include "base/callback.h"
 #include "base/observer_list.h"
 #include "chromeos/chromeos_export.h"
+#include "chromeos/dbus/bluetooth_profile_manager_client.h"
 #include "chromeos/dbus/dbus_client_implementation_type.h"
-#include "chromeos/dbus/experimental_bluetooth_profile_manager_client.h"
 #include "dbus/object_path.h"
 #include "dbus/property.h"
 
@@ -25,12 +25,12 @@ class FakeBluetoothProfileServiceProvider;
 // Daemon's profile manager object and is used both in test cases in place of a
 // mock and on the Linux desktop.
 class CHROMEOS_EXPORT FakeBluetoothProfileManagerClient
-    : public ExperimentalBluetoothProfileManagerClient {
+    : public BluetoothProfileManagerClient {
  public:
   FakeBluetoothProfileManagerClient();
   virtual ~FakeBluetoothProfileManagerClient();
 
-  // ExperimentalBluetoothProfileManagerClient override
+  // BluetoothProfileManagerClient override
   virtual void RegisterProfile(const dbus::ObjectPath& profile_path,
                                const std::string& uuid,
                                const Options& options,
diff --git a/chromeos/dbus/fake_bluetooth_profile_service_provider.cc b/chromeos/dbus/fake_bluetooth_profile_service_provider.cc
index a021464..d07e825 100644
--- a/chromeos/dbus/fake_bluetooth_profile_service_provider.cc
+++ b/chromeos/dbus/fake_bluetooth_profile_service_provider.cc
@@ -19,8 +19,7 @@ FakeBluetoothProfileServiceProvider::FakeBluetoothProfileServiceProvider(
 
   FakeBluetoothProfileManagerClient* fake_bluetooth_profile_manager_client =
       static_cast<FakeBluetoothProfileManagerClient*>(
-          DBusThreadManager::Get()->
-              GetExperimentalBluetoothProfileManagerClient());
+          DBusThreadManager::Get()->GetBluetoothProfileManagerClient());
   fake_bluetooth_profile_manager_client->RegisterProfileServiceProvider(this);
 }
 
@@ -29,8 +28,7 @@ FakeBluetoothProfileServiceProvider::~FakeBluetoothProfileServiceProvider() {
 
   FakeBluetoothProfileManagerClient* fake_bluetooth_profile_manager_client =
       static_cast<FakeBluetoothProfileManagerClient*>(
-          DBusThreadManager::Get()->
-              GetExperimentalBluetoothProfileManagerClient());
+          DBusThreadManager::Get()->GetBluetoothProfileManagerClient());
   fake_bluetooth_profile_manager_client->UnregisterProfileServiceProvider(this);
 }
 
diff --git a/chromeos/dbus/fake_bluetooth_profile_service_provider.h b/chromeos/dbus/fake_bluetooth_profile_service_provider.h
index c886f71..14ffd25 100644
--- a/chromeos/dbus/fake_bluetooth_profile_service_provider.h
+++ b/chromeos/dbus/fake_bluetooth_profile_service_provider.h
@@ -9,8 +9,8 @@
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "chromeos/chromeos_export.h"
+#include "chromeos/dbus/bluetooth_profile_service_provider.h"
 #include "chromeos/dbus/dbus_client_implementation_type.h"
-#include "chromeos/dbus/experimental_bluetooth_profile_service_provider.h"
 #include "dbus/file_descriptor.h"
 #include "dbus/object_path.h"
 
@@ -20,7 +20,7 @@ namespace chromeos {
 // Bluetooth agent object and is used both in test cases in place of a
 // mock and on the Linux desktop.
 class CHROMEOS_EXPORT FakeBluetoothProfileServiceProvider
-    : public ExperimentalBluetoothProfileServiceProvider {
+    : public BluetoothProfileServiceProvider {
  public:
   FakeBluetoothProfileServiceProvider(const dbus::ObjectPath& object_path,
                                       Delegate *delegate);
diff --git a/chromeos/dbus/mock_dbus_thread_manager.cc b/chromeos/dbus/mock_dbus_thread_manager.cc
index 2265a08..6245e46 100644
--- a/chromeos/dbus/mock_dbus_thread_manager.cc
+++ b/chromeos/dbus/mock_dbus_thread_manager.cc
@@ -67,15 +67,15 @@ MockDBusThreadManager::MockDBusThreadManager()
       mock_session_manager_client_(new MockSessionManagerClient) {
   EXPECT_CALL(*this, GetCryptohomeClient())
       .WillRepeatedly(Return(mock_cryptohome_client()));
-  EXPECT_CALL(*this, GetExperimentalBluetoothAdapterClient())
+  EXPECT_CALL(*this, GetBluetoothAdapterClient())
       .WillRepeatedly(Return(fake_bluetooth_adapter_client_.get()));
-  EXPECT_CALL(*this, GetExperimentalBluetoothAgentManagerClient())
+  EXPECT_CALL(*this, GetBluetoothAgentManagerClient())
       .WillRepeatedly(Return(fake_bluetooth_agent_manager_client()));
-  EXPECT_CALL(*this, GetExperimentalBluetoothDeviceClient())
+  EXPECT_CALL(*this, GetBluetoothDeviceClient())
       .WillRepeatedly(Return(fake_bluetooth_device_client_.get()));
-  EXPECT_CALL(*this, GetExperimentalBluetoothInputClient())
+  EXPECT_CALL(*this, GetBluetoothInputClient())
       .WillRepeatedly(Return(fake_bluetooth_input_client_.get()));
-  EXPECT_CALL(*this, GetExperimentalBluetoothProfileManagerClient())
+  EXPECT_CALL(*this, GetBluetoothProfileManagerClient())
       .WillRepeatedly(Return(fake_bluetooth_profile_manager_client()));
   EXPECT_CALL(*this, GetShillDeviceClient())
       .WillRepeatedly(Return(mock_shill_device_client()));
diff --git a/chromeos/dbus/mock_dbus_thread_manager.h b/chromeos/dbus/mock_dbus_thread_manager.h
index 33cb2f1..60f61ee 100644
--- a/chromeos/dbus/mock_dbus_thread_manager.h
+++ b/chromeos/dbus/mock_dbus_thread_manager.h
@@ -51,20 +51,17 @@ class MockDBusThreadManager : public DBusThreadManager {
                                  const base::Closure& closure));
   MOCK_METHOD0(GetSystemBus, dbus::Bus*(void));
   MOCK_METHOD0(GetIBusBus, dbus::Bus*(void));
+  MOCK_METHOD0(GetBluetoothAdapterClient, BluetoothAdapterClient*(void));
+  MOCK_METHOD0(GetBluetoothAgentManagerClient,
+               BluetoothAgentManagerClient*(void));
+  MOCK_METHOD0(GetBluetoothDeviceClient, BluetoothDeviceClient*(void));
+  MOCK_METHOD0(GetBluetoothInputClient, BluetoothInputClient*(void));
+  MOCK_METHOD0(GetBluetoothProfileManagerClient,
+               BluetoothProfileManagerClient*(void));
   MOCK_METHOD0(GetCrasAudioClient, CrasAudioClient*(void));
   MOCK_METHOD0(GetCrosDisksClient, CrosDisksClient*(void));
   MOCK_METHOD0(GetCryptohomeClient, CryptohomeClient*(void));
   MOCK_METHOD0(GetDebugDaemonClient, DebugDaemonClient*(void));
-  MOCK_METHOD0(GetExperimentalBluetoothAdapterClient,
-               ExperimentalBluetoothAdapterClient*(void));
-  MOCK_METHOD0(GetExperimentalBluetoothAgentManagerClient,
-               ExperimentalBluetoothAgentManagerClient*(void));
-  MOCK_METHOD0(GetExperimentalBluetoothDeviceClient,
-               ExperimentalBluetoothDeviceClient*(void));
-  MOCK_METHOD0(GetExperimentalBluetoothInputClient,
-               ExperimentalBluetoothInputClient*(void));
-  MOCK_METHOD0(GetExperimentalBluetoothProfileManagerClient,
-               ExperimentalBluetoothProfileManagerClient*(void));
   MOCK_METHOD0(GetShillDeviceClient, ShillDeviceClient*(void));
   MOCK_METHOD0(GetShillIPConfigClient, ShillIPConfigClient*(void));
   MOCK_METHOD0(GetShillManagerClient, ShillManagerClient*(void));
diff --git a/chromeos/dbus/mock_dbus_thread_manager_without_gmock.cc b/chromeos/dbus/mock_dbus_thread_manager_without_gmock.cc
index 6d38aca..c35fd25 100644
--- a/chromeos/dbus/mock_dbus_thread_manager_without_gmock.cc
+++ b/chromeos/dbus/mock_dbus_thread_manager_without_gmock.cc
@@ -88,48 +88,46 @@ dbus::Bus* MockDBusThreadManagerWithoutGMock::GetIBusBus() {
   return ibus_bus_;
 }
 
-CrasAudioClient* MockDBusThreadManagerWithoutGMock::GetCrasAudioClient() {
-  return NULL;
+BluetoothAdapterClient*
+    MockDBusThreadManagerWithoutGMock::GetBluetoothAdapterClient() {
+  return fake_bluetooth_adapter_client_.get();
 }
 
-CrosDisksClient* MockDBusThreadManagerWithoutGMock::GetCrosDisksClient() {
-  return fake_cros_disks_client_.get();
+BluetoothAgentManagerClient*
+    MockDBusThreadManagerWithoutGMock::GetBluetoothAgentManagerClient() {
+  return fake_bluetooth_agent_manager_client_.get();
 }
 
-CryptohomeClient* MockDBusThreadManagerWithoutGMock::GetCryptohomeClient() {
-  return fake_cryptohome_client_.get();
+BluetoothDeviceClient*
+    MockDBusThreadManagerWithoutGMock::GetBluetoothDeviceClient() {
+  return fake_bluetooth_device_client_.get();
 }
 
-DebugDaemonClient* MockDBusThreadManagerWithoutGMock::GetDebugDaemonClient() {
-  NOTIMPLEMENTED();
-  return NULL;
+BluetoothInputClient*
+    MockDBusThreadManagerWithoutGMock::GetBluetoothInputClient() {
+  return fake_bluetooth_input_client_.get();
 }
 
-ExperimentalBluetoothAdapterClient*
-    MockDBusThreadManagerWithoutGMock::GetExperimentalBluetoothAdapterClient() {
-  return fake_bluetooth_adapter_client_.get();
+BluetoothProfileManagerClient*
+    MockDBusThreadManagerWithoutGMock::GetBluetoothProfileManagerClient() {
+  return fake_bluetooth_profile_manager_client_.get();
 }
 
-ExperimentalBluetoothAgentManagerClient*
-    MockDBusThreadManagerWithoutGMock::
-        GetExperimentalBluetoothAgentManagerClient() {
-  return fake_bluetooth_agent_manager_client_.get();
+CrasAudioClient* MockDBusThreadManagerWithoutGMock::GetCrasAudioClient() {
+  return NULL;
 }
 
-ExperimentalBluetoothDeviceClient*
-    MockDBusThreadManagerWithoutGMock::GetExperimentalBluetoothDeviceClient() {
-  return fake_bluetooth_device_client_.get();
+CrosDisksClient* MockDBusThreadManagerWithoutGMock::GetCrosDisksClient() {
+  return fake_cros_disks_client_.get();
 }
 
-ExperimentalBluetoothInputClient*
-    MockDBusThreadManagerWithoutGMock::GetExperimentalBluetoothInputClient() {
-  return fake_bluetooth_input_client_.get();
+CryptohomeClient* MockDBusThreadManagerWithoutGMock::GetCryptohomeClient() {
+  return fake_cryptohome_client_.get();
 }
 
-ExperimentalBluetoothProfileManagerClient*
-    MockDBusThreadManagerWithoutGMock::
-        GetExperimentalBluetoothProfileManagerClient() {
-  return fake_bluetooth_profile_manager_client_.get();
+DebugDaemonClient* MockDBusThreadManagerWithoutGMock::GetDebugDaemonClient() {
+  NOTIMPLEMENTED();
+  return NULL;
 }
 
 ShillDeviceClient*
diff --git a/chromeos/dbus/mock_dbus_thread_manager_without_gmock.h b/chromeos/dbus/mock_dbus_thread_manager_without_gmock.h
index 3810cea..c57cd35 100644
--- a/chromeos/dbus/mock_dbus_thread_manager_without_gmock.h
+++ b/chromeos/dbus/mock_dbus_thread_manager_without_gmock.h
@@ -57,20 +57,17 @@ class MockDBusThreadManagerWithoutGMock : public DBusThreadManager {
   virtual dbus::Bus* GetSystemBus() OVERRIDE;
   virtual dbus::Bus* GetIBusBus() OVERRIDE;
 
+  virtual BluetoothAdapterClient* GetBluetoothAdapterClient() OVERRIDE;
+  virtual BluetoothAgentManagerClient*
+      GetBluetoothAgentManagerClient() OVERRIDE;
+  virtual BluetoothDeviceClient* GetBluetoothDeviceClient() OVERRIDE;
+  virtual BluetoothInputClient* GetBluetoothInputClient() OVERRIDE;
+  virtual BluetoothProfileManagerClient*
+      GetBluetoothProfileManagerClient() OVERRIDE;
   virtual CrasAudioClient* GetCrasAudioClient() OVERRIDE;
   virtual CrosDisksClient* GetCrosDisksClient() OVERRIDE;
   virtual CryptohomeClient* GetCryptohomeClient() OVERRIDE;
   virtual DebugDaemonClient* GetDebugDaemonClient() OVERRIDE;
-  virtual ExperimentalBluetoothAdapterClient*
-      GetExperimentalBluetoothAdapterClient() OVERRIDE;
-  virtual ExperimentalBluetoothAgentManagerClient*
-      GetExperimentalBluetoothAgentManagerClient() OVERRIDE;
-  virtual ExperimentalBluetoothDeviceClient*
-      GetExperimentalBluetoothDeviceClient() OVERRIDE;
-  virtual ExperimentalBluetoothInputClient*
-      GetExperimentalBluetoothInputClient() OVERRIDE;
-  virtual ExperimentalBluetoothProfileManagerClient*
-      GetExperimentalBluetoothProfileManagerClient() OVERRIDE;
   virtual ShillDeviceClient* GetShillDeviceClient() OVERRIDE;
   virtual ShillIPConfigClient* GetShillIPConfigClient() OVERRIDE;
   virtual ShillManagerClient* GetShillManagerClient() OVERRIDE;
@@ -186,7 +183,6 @@ class MockDBusThreadManagerWithoutGMock : public DBusThreadManager {
   // their c'tors.
   ObserverList<DBusThreadManagerObserver> observers_;
 
-  // These fake_bluetooth_*_client_ are for ExperimentalBluetooth*Client.
   scoped_ptr<FakeBluetoothAdapterClient> fake_bluetooth_adapter_client_;
   scoped_ptr<FakeBluetoothAgentManagerClient>
       fake_bluetooth_agent_manager_client_;