Added switch that let us 'un-stub' certain dbus clients.

chromeos/dbus/bluetooth_gatt_service_service_provider.cc

 // Copyright 2014 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/bluetooth_gatt_service_service_provider.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
-#include "base/sys_info.h"
 #include "base/threading/platform_thread.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/fake_bluetooth_gatt_service_service_provider.h"
 #include "dbus/exported_object.h"
 #include "dbus/message.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 namespace chromeos {
 namespace {
 const char kErrorInvalidArgs[] =
     "org.freedesktop.DBus.Error.InvalidArgs";
 const char kErrorPropertyReadOnly[] =
@@ skipping 239 matching lines @@
 BluetoothGattServiceServiceProvider::~BluetoothGattServiceServiceProvider() {
 }
 
 // static
 BluetoothGattServiceServiceProvider*
 BluetoothGattServiceServiceProvider::Create(
     dbus::Bus* bus,
     const dbus::ObjectPath& object_path,
     const std::string& uuid,
     const std::vector<dbus::ObjectPath>& includes) {
-  if (base::SysInfo::IsRunningOnChromeOS()) {
+  if (!DBusThreadManager::IsUsingStub(DBusClientBundle::BLUETOOTH)) {
     return new BluetoothGattServiceServiceProviderImpl(
         bus, object_path, uuid, includes);
   }
   return new FakeBluetoothGattServiceServiceProvider(
       object_path, uuid, includes);
 }
 
 }  // namespace chromeos