#include "base/bind.h"
#include "base/message_loop/message_loop.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
#include "chromeos/dbus/fake_cros_disks_client.h"
-#include "chromeos/dbus/fake_dbus_thread_manager.h"
#include "chromeos/disks/disk_mount_manager.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
using chromeos::CrosDisksClient;
using chromeos::DBusThreadManager;
using chromeos::FakeCrosDisksClient;
-using chromeos::FakeDBusThreadManager;
using testing::_;
using testing::Field;
using testing::InSequence;
// Initializes disk mount manager disks and mount points.
// Adds a test observer to the disk mount manager.
virtual void SetUp() {
- FakeDBusThreadManager* fake_thread_manager = new FakeDBusThreadManager();
fake_cros_disks_client_ = new FakeCrosDisksClient;
- fake_thread_manager->SetCrosDisksClient(
+ DBusThreadManager::GetSetterForTesting()->SetCrosDisksClient(
scoped_ptr<CrosDisksClient>(fake_cros_disks_client_));
- DBusThreadManager::InitializeForTesting(fake_thread_manager);
-
DiskMountManager::Initialize();
InitDisksAndMountPoints();