Merged FakedDBusThreadManager with DBusThreadManager.

chrome/browser/chromeos/policy/device_status_collector_browsertest.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 "chrome/browser/chromeos/policy/device_status_collector.h"
 
 #include "base/environment.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 691 matching lines @@
     em::NetworkInterface::TYPE_BLUETOOTH },
   { "/device/vpn", shill::kTypeVPN, "vpn",
     "", "", "",
     -1 },
 };
 
 class DeviceStatusCollectorNetworkInterfacesTest
     : public DeviceStatusCollectorTest {
  protected:
   virtual void SetUp() OVERRIDE {
-    chromeos::DBusThreadManager::InitializeWithStub();
+    chromeos::DBusThreadManager::Initialize();
     chromeos::NetworkHandler::Initialize();
     chromeos::ShillDeviceClient::TestInterface* test_device_client =
         chromeos::DBusThreadManager::Get()->GetShillDeviceClient()->
             GetTestInterface();
     test_device_client->ClearDevices();
     for (size_t i = 0; i < arraysize(kFakeDevices); ++i) {
       const FakeDeviceData& dev = kFakeDevices[i];
       test_device_client->AddDevice(dev.device_path, dev.type,
                                     dev.object_path);
       if (*dev.mac_address) {
@@ skipping 64 matching lines @@
     }
 
     EXPECT_TRUE(found_match) << "No matching interface for fake device " << i;
     count++;
   }
 
   EXPECT_EQ(count, status_.network_interface_size());
 }
 
 }  // namespace policy