diff options
| author | pneubeck@chromium.org <pneubeck@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-10 16:02:49 +0000 |
|---|---|---|
| committer | pneubeck@chromium.org <pneubeck@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-10 16:02:49 +0000 |
| commit | 54652d823fd3498a8fa4a294adfb1e5068f24079 (patch) | |
| tree | 3910548219aa193f1ab7b19447d3a082d0c0f0d1 /chromeos/disks | |
| parent | f3b041e6e425002bc05e0cb729fb4d0b58292d5f (diff) | |
| download | chromium_src-54652d823fd3498a8fa4a294adfb1e5068f24079.zip chromium_src-54652d823fd3498a8fa4a294adfb1e5068f24079.tar.gz chromium_src-54652d823fd3498a8fa4a294adfb1e5068f24079.tar.bz2 | |
ChromeOS: Remove MockDBusThreadManager.
- Extends FakeDBusThreadManager about DBusClient setters.
- Removes default initialization of DBusClients from FakeDBusThreadManager.
- Replaces all occurrences of MockDBusThreadManager in tests by FakeDBusThreadManager.
- Every test now creates exactly the DBusClients that are required.
- Removes all references to Fake/Stub implementations from the DBusThreadManagerImpl used for production.
Depends on:
https://codereview.chromium.org/50243005/
BUG=275286
TBR=miket@chromium.org,mkwst@chromium.org,rtenneti@chromium.org
Review URL: https://codereview.chromium.org/49773003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@234172 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos/disks')
| -rw-r--r-- | chromeos/disks/disk_mount_manager_unittest.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chromeos/disks/disk_mount_manager_unittest.cc b/chromeos/disks/disk_mount_manager_unittest.cc index 83def45..36e67ad 100644 --- a/chromeos/disks/disk_mount_manager_unittest.cc +++ b/chromeos/disks/disk_mount_manager_unittest.cc @@ -122,9 +122,11 @@ class DiskMountManagerTest : public testing::Test { // Adds a test observer to the disk mount manager. virtual void SetUp() { FakeDBusThreadManager* fake_thread_manager = new FakeDBusThreadManager(); - DBusThreadManager::InitializeForTesting(fake_thread_manager); + fake_cros_disks_client_ = new FakeCrosDisksClient; + fake_thread_manager->SetCrosDisksClient( + scoped_ptr<CrosDisksClient>(fake_cros_disks_client_)); - fake_cros_disks_client_ = fake_thread_manager->fake_cros_disks_client(); + DBusThreadManager::InitializeForTesting(fake_thread_manager); DiskMountManager::Initialize(); |