chromeos: Add dbus MTPDClient.

chromeos/dbus/dbus_thread_manager.cc

Index: chromeos/dbus/dbus_thread_manager.cc
===================================================================
--- chromeos/dbus/dbus_thread_manager.cc	(revision 149696)
+++ chromeos/dbus/dbus_thread_manager.cc	(working copy)
@@ -4,6 +4,8 @@
 
 #include "chromeos/dbus/dbus_thread_manager.h"
 
+#include <map>
+
 #include "base/chromeos/chromeos_version.h"
 #include "base/command_line.h"
 #include "base/threading/thread.h"
@@ -33,6 +35,7 @@
 #include "chromeos/dbus/image_burner_client.h"
 #include "chromeos/dbus/introspectable_client.h"
 #include "chromeos/dbus/modem_messaging_client.h"
+#include "chromeos/dbus/mtpd_client.h"
 #include "chromeos/dbus/power_manager_client.h"
 #include "chromeos/dbus/session_manager_client.h"
 #include "chromeos/dbus/sms_client.h"
@@ -120,6 +123,8 @@
     // Create the introspectable object client.
     introspectable_client_.reset(
         IntrospectableClient::Create(client_type, system_bus_.get()));
+    // Create the MTPD client.
+    mtpd_client_.reset(MTPDClient::Create(client_type, system_bus_.get()));
     // Create the ModemMessaging client.
     modem_messaging_client_.reset(
         ModemMessagingClient::Create(client_type, system_bus_.get()));
@@ -296,6 +301,11 @@
   }
 
   // DBusThreadManager override.
+  virtual MTPDClient* GetMTPDClient() OVERRIDE {
+    return mtpd_client_.get();
+  }
+
+  // DBusThreadManager override.
   virtual ModemMessagingClient* GetModemMessagingClient() OVERRIDE {
     return modem_messaging_client_.get();
   }
@@ -343,7 +353,6 @@
   // DBusThreadManager override.
   virtual IBusEngineService* GetIBusEngineService(
       const dbus::ObjectPath& object_path) OVERRIDE {
-
     const DBusClientImplementationType client_type =
         base::chromeos::IsRunningOnChromeOS() ? REAL_DBUS_CLIENT_IMPLEMENTATION
                                               : STUB_DBUS_CLIENT_IMPLEMENTATION;
@@ -389,6 +398,7 @@
   scoped_ptr<GsmSMSClient> gsm_sms_client_;
   scoped_ptr<ImageBurnerClient> image_burner_client_;
   scoped_ptr<IntrospectableClient> introspectable_client_;
+  scoped_ptr<MTPDClient> mtpd_client_;
   scoped_ptr<ModemMessagingClient> modem_messaging_client_;
   scoped_ptr<PowerManagerClient> power_manager_client_;
   scoped_ptr<SessionManagerClient> session_manager_client_;