Merged FakedDBusThreadManager with DBusThreadManager.

chromeos/network/network_sms_handler_unittest.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/network/network_sms_handler.h"
 
 #include <set>
 #include <string>
 
 #include "base/command_line.h"
@@ skipping 42 matching lines @@
   NetworkSmsHandlerTest() {}
   virtual ~NetworkSmsHandlerTest() {}
 
   virtual void SetUp() OVERRIDE {
     // Append '--sms-test-messages' to the command line to tell
     // SMSClientStubImpl to generate a series of test SMS messages.
     CommandLine* command_line = CommandLine::ForCurrentProcess();
     command_line->AppendSwitch(chromeos::switches::kSmsTestMessages);
 
     // Initialize DBusThreadManager with a stub implementation.
-    DBusThreadManager::InitializeWithStub();
+    DBusThreadManager::Initialize();
     ShillDeviceClient::TestInterface* device_test =
         DBusThreadManager::Get()->GetShillDeviceClient()->GetTestInterface();
     ASSERT_TRUE(device_test);
     device_test->AddDevice("/org/freedesktop/ModemManager1/stub/0",
                            shill::kTypeCellular,
                            "stub_cellular_device2");
 
     // This relies on the stub dbus implementations for ShillManagerClient,
     // ShillDeviceClient, GsmSMSClient, ModemMessagingClient and SMSClient.
     // Initialize a sms handler. The stub dbus clients will not send the
@@ skipping 30 matching lines @@
 
   // Test for messages delivered by signals.
   test_observer_->ClearMessages();
   network_sms_handler_->RequestUpdate(false);
   message_loop_.RunUntilIdle();
   EXPECT_GE(test_observer_->message_count(), 1);
   EXPECT_NE(messages.find(kMessage1), messages.end());
 }
 
 }  // namespace chromeos