diff options
| author | satorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-22 03:43:56 +0000 |
|---|---|---|
| committer | satorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-22 03:43:56 +0000 |
| commit | 64315b2ac09c63dd3d8da3a5c2d76a335691af05 (patch) | |
| tree | 83c06b51f5b51a387427513a68e275291827393d /chromeos/disks/disk_mount_manager_unittest.cc | |
| parent | ab2a7e3cda5f9f73b6e20b4e8d5cc1f526c91b32 (diff) | |
| download | chromium_src-64315b2ac09c63dd3d8da3a5c2d76a335691af05.zip chromium_src-64315b2ac09c63dd3d8da3a5c2d76a335691af05.tar.gz chromium_src-64315b2ac09c63dd3d8da3a5c2d76a335691af05.tar.bz2 | |
dbus: Rename MockDBusTreadManagerWithoutGMock to FakeDBusThreadManager
The original name was a misnomer as the class behaves like a fake
and hosts fake D-Bus client classes. No semantic changes.
BUG=223061
TEST=none
R=hashimoto@chromium.org, miket@chromium.org, nona@chromium.org, thestig@chromium.org
Review URL: https://codereview.chromium.org/31793003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@230035 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos/disks/disk_mount_manager_unittest.cc')
| -rw-r--r-- | chromeos/disks/disk_mount_manager_unittest.cc | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/chromeos/disks/disk_mount_manager_unittest.cc b/chromeos/disks/disk_mount_manager_unittest.cc index 5460258..83def45 100644 --- a/chromeos/disks/disk_mount_manager_unittest.cc +++ b/chromeos/disks/disk_mount_manager_unittest.cc @@ -5,7 +5,7 @@ #include "base/bind.h" #include "base/message_loop/message_loop.h" #include "chromeos/dbus/fake_cros_disks_client.h" -#include "chromeos/dbus/mock_dbus_thread_manager_without_gmock.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" @@ -14,7 +14,7 @@ using chromeos::disks::DiskMountManager; using chromeos::CrosDisksClient; using chromeos::DBusThreadManager; using chromeos::FakeCrosDisksClient; -using chromeos::MockDBusThreadManagerWithoutGMock; +using chromeos::FakeDBusThreadManager; using testing::_; using testing::Field; using testing::InSequence; @@ -121,11 +121,10 @@ class DiskMountManagerTest : public testing::Test { // Initializes disk mount manager disks and mount points. // Adds a test observer to the disk mount manager. virtual void SetUp() { - MockDBusThreadManagerWithoutGMock* mock_thread_manager = - new MockDBusThreadManagerWithoutGMock(); - DBusThreadManager::InitializeForTesting(mock_thread_manager); + FakeDBusThreadManager* fake_thread_manager = new FakeDBusThreadManager(); + DBusThreadManager::InitializeForTesting(fake_thread_manager); - fake_cros_disks_client_ = mock_thread_manager->fake_cros_disks_client(); + fake_cros_disks_client_ = fake_thread_manager->fake_cros_disks_client(); DiskMountManager::Initialize(); @@ -631,4 +630,3 @@ TEST_F(DiskMountManagerTest, Format_ConsecutiveFormatCalls) { } } // namespace - |