Merged FakedDBusThreadManager with DBusThreadManager.

chromeos/dbus/dbus_client_bundle.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/dbus_client_bundle.h"
 
 #include "base/command_line.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "chromeos/chromeos_switches.h"
@@ skipping 202 matching lines @@
     image_burner_client_.reset(new FakeImageBurnerClient);
 
   if (!DBusThreadManager::IsUsingStub(INTROSPECTABLE))
     introspectable_client_.reset(IntrospectableClient::Create());
   else
     introspectable_client_.reset(new FakeIntrospectableClient);
 
   if (!DBusThreadManager::IsUsingStub(MODEM_MESSAGING))
     modem_messaging_client_.reset(ModemMessagingClient::Create());
   else
-    modem_messaging_client_.reset(ModemMessagingClient::Create());
+    modem_messaging_client_.reset(new FakeModemMessagingClient);
 
   // Create the NFC clients in the correct order based on their dependencies.
   if (!DBusThreadManager::IsUsingStub(NFC)) {
     nfc_manager_client_.reset(NfcManagerClient::Create());
     nfc_adapter_client_.reset(
         NfcAdapterClient::Create(nfc_manager_client_.get()));
     nfc_device_client_.reset(
         NfcDeviceClient::Create(nfc_adapter_client_.get()));
     nfc_tag_client_.reset(NfcTagClient::Create(nfc_adapter_client_.get()));
     nfc_record_client_.reset(NfcRecordClient::Create(nfc_device_client_.get(),
@@ skipping 62 matching lines @@
       unstub_mask |= client;
     } else {
       LOG(ERROR) << "Unknown dbus client: " << *iter;
     }
   }
 
   return unstub_mask;
 }
 
 }  // namespace chromeos