From 64315b2ac09c63dd3d8da3a5c2d76a335691af05 Mon Sep 17 00:00:00 2001 From: "satorux@chromium.org" Date: Tue, 22 Oct 2013 03:43:56 +0000 Subject: 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 --- device/bluetooth/bluetooth_chromeos_unittest.cc | 13 ++++++------- device/bluetooth/bluetooth_profile_chromeos_unittest.cc | 11 +++++------ 2 files changed, 11 insertions(+), 13 deletions(-) (limited to 'device') diff --git a/device/bluetooth/bluetooth_chromeos_unittest.cc b/device/bluetooth/bluetooth_chromeos_unittest.cc index 63685bd..3adaacb 100644 --- a/device/bluetooth/bluetooth_chromeos_unittest.cc +++ b/device/bluetooth/bluetooth_chromeos_unittest.cc @@ -6,7 +6,7 @@ #include "base/strings/utf_string_conversions.h" #include "chromeos/dbus/fake_bluetooth_adapter_client.h" #include "chromeos/dbus/fake_bluetooth_device_client.h" -#include "chromeos/dbus/mock_dbus_thread_manager_without_gmock.h" +#include "chromeos/dbus/fake_dbus_thread_manager.h" #include "dbus/object_path.h" #include "device/bluetooth/bluetooth_adapter.h" #include "device/bluetooth/bluetooth_adapter_chromeos.h" @@ -208,14 +208,13 @@ class TestPairingDelegate : public BluetoothDevice::PairingDelegate { class BluetoothChromeOSTest : public testing::Test { public: virtual void SetUp() { - mock_dbus_thread_manager_ = - new MockDBusThreadManagerWithoutGMock(); - DBusThreadManager::InitializeForTesting(mock_dbus_thread_manager_); + fake_dbus_thread_manager_ = new FakeDBusThreadManager(); + DBusThreadManager::InitializeForTesting(fake_dbus_thread_manager_); fake_bluetooth_adapter_client_ = - mock_dbus_thread_manager_->fake_bluetooth_adapter_client(); + fake_dbus_thread_manager_->fake_bluetooth_adapter_client(); fake_bluetooth_device_client_ = - mock_dbus_thread_manager_->fake_bluetooth_device_client(); + fake_dbus_thread_manager_->fake_bluetooth_device_client(); callback_count_ = 0; error_callback_count_ = 0; @@ -313,7 +312,7 @@ class BluetoothChromeOSTest : public testing::Test { protected: FakeBluetoothAdapterClient* fake_bluetooth_adapter_client_; FakeBluetoothDeviceClient* fake_bluetooth_device_client_; - MockDBusThreadManagerWithoutGMock* mock_dbus_thread_manager_; + FakeDBusThreadManager* fake_dbus_thread_manager_; scoped_refptr adapter_; int callback_count_; diff --git a/device/bluetooth/bluetooth_profile_chromeos_unittest.cc b/device/bluetooth/bluetooth_profile_chromeos_unittest.cc index fede079..bd91b86 100644 --- a/device/bluetooth/bluetooth_profile_chromeos_unittest.cc +++ b/device/bluetooth/bluetooth_profile_chromeos_unittest.cc @@ -6,7 +6,7 @@ #include "chromeos/dbus/fake_bluetooth_device_client.h" #include "chromeos/dbus/fake_bluetooth_profile_manager_client.h" #include "chromeos/dbus/fake_bluetooth_profile_service_provider.h" -#include "chromeos/dbus/mock_dbus_thread_manager_without_gmock.h" +#include "chromeos/dbus/fake_dbus_thread_manager.h" #include "device/bluetooth/bluetooth_adapter.h" #include "device/bluetooth/bluetooth_adapter_chromeos.h" #include "device/bluetooth/bluetooth_adapter_factory.h" @@ -38,12 +38,11 @@ class BluetoothProfileChromeOSTest : public testing::Test { last_device_(NULL) {} virtual void SetUp() { - mock_dbus_thread_manager_ = - new MockDBusThreadManagerWithoutGMock(); - DBusThreadManager::InitializeForTesting(mock_dbus_thread_manager_); + fake_dbus_thread_manager_ = new FakeDBusThreadManager(); + DBusThreadManager::InitializeForTesting(fake_dbus_thread_manager_); fake_bluetooth_profile_manager_client_ = - mock_dbus_thread_manager_->fake_bluetooth_profile_manager_client(); + fake_dbus_thread_manager_->fake_bluetooth_profile_manager_client(); device::BluetoothAdapterFactory::GetAdapter( base::Bind(&BluetoothProfileChromeOSTest::AdapterCallback, @@ -96,7 +95,7 @@ class BluetoothProfileChromeOSTest : public testing::Test { base::MessageLoop message_loop_; FakeBluetoothProfileManagerClient* fake_bluetooth_profile_manager_client_; - MockDBusThreadManagerWithoutGMock* mock_dbus_thread_manager_; + FakeDBusThreadManager* fake_dbus_thread_manager_; scoped_refptr adapter_; unsigned int callback_count_; -- cgit v1.1