Merged FakedDBusThreadManager with DBusThreadManager.

chromeos/network/host_resolver_impl_chromeos_unittest.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/network/host_resolver_impl_chromeos.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/strings/stringprintf.h"
@@ skipping 23 matching lines @@
 
 }  // namespace
 
 class HostResolverImplChromeOSTest : public testing::Test {
  public:
   HostResolverImplChromeOSTest() {}
 
   virtual ~HostResolverImplChromeOSTest() {}
 
   virtual void SetUp() OVERRIDE {
-    chromeos::DBusThreadManager::InitializeWithStub();
+    chromeos::DBusThreadManager::Initialize();
 
     network_state_handler_.reset(
         chromeos::NetworkStateHandler::InitializeForTest());
     base::RunLoop().RunUntilIdle();
 
     const chromeos::NetworkState* default_network =
         network_state_handler_->DefaultNetwork();
     ASSERT_TRUE(default_network);
     const chromeos::DeviceState* default_device =
         network_state_handler_->GetDeviceState(default_network->device_path());
@@ skipping 108 matching lines @@
   EXPECT_EQ(expected, addresses_[0].ToString());
 
   info.set_address_family(net::ADDRESS_FAMILY_IPV6);
   EXPECT_EQ(net::OK, CallResolve(info));
   ASSERT_EQ(2u, addresses_.size());
   expected = base::StringPrintf("[%s]:%d", kTestIPv6Address, 0);
   EXPECT_EQ(expected, addresses_[0].ToString());
   expected = base::StringPrintf("%s:%d", kTestIPv4Address, 0);
   EXPECT_EQ(expected, addresses_[1].ToString());
 }