cros: Add biod interfaces to dbus thread manager.

chromeos/dbus/dbus_clients_common.cc

Index: chromeos/dbus/dbus_clients_common.cc
diff --git a/chromeos/dbus/dbus_clients_common.cc b/chromeos/dbus/dbus_clients_common.cc
index 77b8f7ce32c2489d56193763b2877292e78caeda..f23aa2ff9f85857c7e3290232fce5ff60e62712d 100644
--- a/chromeos/dbus/dbus_clients_common.cc
+++ b/chromeos/dbus/dbus_clients_common.cc
@@ -6,6 +6,7 @@
 
 #include "base/command_line.h"
 #include "chromeos/chromeos_switches.h"
+#include "chromeos/dbus/biod/biod_client.h"
 #include "chromeos/dbus/cras_audio_client.h"
 #include "chromeos/dbus/cryptohome_client.h"
 #include "chromeos/dbus/dbus_client_implementation_type.h"
@@ -42,6 +43,12 @@
 namespace chromeos {
 
 DBusClientsCommon::DBusClientsCommon(bool use_real_clients) {
+  const DBusClientImplementationType client_impl_type =
+      use_real_clients ? REAL_DBUS_CLIENT_IMPLEMENTATION
+                       : FAKE_DBUS_CLIENT_IMPLEMENTATION;
+
+  biod_client_.reset(BiodClient::Create(client_impl_type));
+
   if (use_real_clients)
     cras_audio_client_.reset(CrasAudioClient::Create());
   else
@@ -90,13 +97,9 @@ DBusClientsCommon::DBusClientsCommon(bool use_real_clients) {
   else
     permission_broker_client_.reset(new FakePermissionBrokerClient);
 
-  power_manager_client_.reset(PowerManagerClient::Create(
-      use_real_clients ? REAL_DBUS_CLIENT_IMPLEMENTATION
-                       : FAKE_DBUS_CLIENT_IMPLEMENTATION));
+  power_manager_client_.reset(PowerManagerClient::Create(client_impl_type));
 
-  session_manager_client_.reset(SessionManagerClient::Create(
-      use_real_clients ? REAL_DBUS_CLIENT_IMPLEMENTATION
-                       : FAKE_DBUS_CLIENT_IMPLEMENTATION));
+  session_manager_client_.reset(SessionManagerClient::Create(client_impl_type));
 
   if (use_real_clients)
     sms_client_.reset(SMSClient::Create());
@@ -108,9 +111,7 @@ DBusClientsCommon::DBusClientsCommon(bool use_real_clients) {
   else
     system_clock_client_.reset(new FakeSystemClockClient);
 
-  update_engine_client_.reset(UpdateEngineClient::Create(
-      use_real_clients ? REAL_DBUS_CLIENT_IMPLEMENTATION
-                       : FAKE_DBUS_CLIENT_IMPLEMENTATION));
+  update_engine_client_.reset(UpdateEngineClient::Create(client_impl_type));
 }
 
 DBusClientsCommon::~DBusClientsCommon() {}
@@ -118,6 +119,7 @@ DBusClientsCommon::~DBusClientsCommon() {}
 void DBusClientsCommon::Initialize(dbus::Bus* system_bus) {
   DCHECK(DBusThreadManager::IsInitialized());
 
+  biod_client_->Init(system_bus);
   cras_audio_client_->Init(system_bus);
   cryptohome_client_->Init(system_bus);
   gsm_sms_client_->Init(system_bus);