#include "base/memory/scoped_ptr.h"
#include "base/message_loop/message_loop.h"
#include "base/values.h"
-#include "chromeos/dbus/fake_dbus_thread_manager.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
#include "chromeos/dbus/fake_shill_device_client.h"
#include "chromeos/dbus/fake_shill_manager_client.h"
#include "chromeos/network/network_device_handler_impl.h"
virtual ~NetworkDeviceHandlerTest() {}
virtual void SetUp() OVERRIDE {
- FakeDBusThreadManager* dbus_manager = new FakeDBusThreadManager;
- dbus_manager->SetFakeShillClients();
-
fake_device_client_ = new FakeShillDeviceClient;
- dbus_manager->SetShillDeviceClient(
+ DBusThreadManager::GetSetterForTesting()->SetShillDeviceClient(
scoped_ptr<ShillDeviceClient>(fake_device_client_));
- DBusThreadManager::InitializeForTesting(dbus_manager);
success_callback_ = base::Bind(&NetworkDeviceHandlerTest::SuccessCallback,
base::Unretained(this));