Merged MixedDBusThreadManager functionality into DBusClientBundle.

chromeos/dbus/dbus_thread_manager.cc

 // Copyright (c) 2012 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/dbus_thread_manager.h"
 
 #include "base/command_line.h"
 #include "base/sys_info.h"
 #include "base/threading/thread.h"
 #include "chromeos/chromeos_switches.h"
@@ skipping 11 matching lines @@
 #include "chromeos/dbus/cryptohome_client.h"
 #include "chromeos/dbus/dbus_client.h"
 #include "chromeos/dbus/dbus_client_bundle.h"
 #include "chromeos/dbus/debug_daemon_client.h"
 #include "chromeos/dbus/easy_unlock_client.h"
 #include "chromeos/dbus/fake_dbus_thread_manager.h"
 #include "chromeos/dbus/gsm_sms_client.h"
 #include "chromeos/dbus/image_burner_client.h"
 #include "chromeos/dbus/introspectable_client.h"
 #include "chromeos/dbus/lorgnette_manager_client.h"
-#include "chromeos/dbus/mixed_dbus_thread_manager.h"
 #include "chromeos/dbus/modem_messaging_client.h"
 #include "chromeos/dbus/nfc_adapter_client.h"
 #include "chromeos/dbus/nfc_device_client.h"
 #include "chromeos/dbus/nfc_manager_client.h"
 #include "chromeos/dbus/nfc_record_client.h"
 #include "chromeos/dbus/nfc_tag_client.h"
 #include "chromeos/dbus/permission_broker_client.h"
 #include "chromeos/dbus/power_manager_client.h"
 #include "chromeos/dbus/power_policy_controller.h"
 #include "chromeos/dbus/session_manager_client.h"
@@ skipping 44 matching lines @@
     client_bundle_.reset();
 
     // Shut down the bus. During the browser shutdown, it's ok to shut down
     // the bus synchronously.
     system_bus_->ShutdownOnDBusThreadAndBlock();
 
     // Stop the D-Bus thread.
     dbus_thread_->Stop();
   }
 
+  void SetupDefaultEnvironment() {
+    return client_bundle_->SetupDefaultEnvironment();
+  }
+
   virtual dbus::Bus* GetSystemBus() OVERRIDE {
     return system_bus_.get();
   }
 
   virtual BluetoothAdapterClient* GetBluetoothAdapterClient() OVERRIDE {
     return client_bundle_->bluetooth_adapter_client();
   }
 
   virtual BluetoothAgentManagerClient* GetBluetoothAgentManagerClient()
       OVERRIDE {
@@ skipping 138 matching lines @@
     return power_policy_controller_.get();
   }
 
  private:
   // Constructs all clients and stores them in the respective *_client_ member
   // variable.
   void CreateDefaultClients() {
     client_bundle_.reset(new DBusClientBundle());
     // TODO(crbug.com/345586): Move PowerPolicyController out of
     // DBusThreadManagerImpl.
-    if (!DBusThreadManager::IsUsingStub(DBusClientBundle::POWER_MANAGER))
-      power_policy_controller_.reset(new PowerPolicyController);
+    power_policy_controller_.reset(new PowerPolicyController);
   }
 
   scoped_ptr<base::Thread> dbus_thread_;
   scoped_refptr<dbus::Bus> system_bus_;
   scoped_ptr<DBusClientBundle> client_bundle_;
   scoped_ptr<PowerPolicyController> power_policy_controller_;
 
   DISALLOW_COPY_AND_ASSIGN(DBusThreadManagerImpl);
 };
 
@@ skipping 64 matching lines @@
   CHECK(g_dbus_thread_manager == NULL);
 
   unstub_client_mask_ = DBusClientBundle::ParseUnstubList(unstub_clients);
   // We should have something parsed correctly here.
   if (unstub_client_mask_ == 0) {
     LOG(FATAL) << "Switch values for --"
                << chromeos::switches::kDbusUnstubClients
                << " cannot be parsed: "
                << unstub_clients;
   }
-  DBusThreadManager* real_thread_manager = new DBusThreadManagerImpl();
-  FakeDBusThreadManager* fake_dbus_thread_manager = new FakeDBusThreadManager;
-  fake_dbus_thread_manager->SetFakeClients();
+  DBusThreadManagerImpl* dbus_thread_manager = new DBusThreadManagerImpl();
   VLOG(1) << "DBusThreadManager initialized for mixed runtime environment";
-  g_dbus_thread_manager = new MixedDBusThreadManager(real_thread_manager,
-                                                     fake_dbus_thread_manager);
+  g_dbus_thread_manager = dbus_thread_manager;
   InitializeClients();
-  fake_dbus_thread_manager->SetupDefaultEnvironment();
+  dbus_thread_manager->SetupDefaultEnvironment();
 }
 
 // static
 void DBusThreadManager::InitializeWithStub() {
   unstub_client_mask_ = DBusClientBundle::NO_CLIENTS;
   // If we initialize DBusThreadManager twice we may also be shutting it down
   // early; do not allow that.
   CHECK(g_dbus_thread_manager == NULL);
   FakeDBusThreadManager* fake_dbus_thread_manager = new FakeDBusThreadManager;
   fake_dbus_thread_manager->SetFakeClients();
@@ skipping 101 matching lines @@
     g_dbus_thread_manager->GetSystemBus()->GetManagedObjects();
 }
 
 // static
 void DBusThreadManager::InitClient(DBusClient* client) {
   if (client)
     client->Init(g_dbus_thread_manager->GetSystemBus());
 }
 
 }  // namespace chromeos