diff options
27 files changed, 148 insertions, 157 deletions
diff --git a/chrome/browser/apps/app_browsertest.cc b/chrome/browser/apps/app_browsertest.cc index 02f77333..b47ffd2 100644 --- a/chrome/browser/apps/app_browsertest.cc +++ b/chrome/browser/apps/app_browsertest.cc @@ -51,8 +51,8 @@ #include "chrome/browser/chromeos/login/mock_user_manager.h" #include "chrome/browser/chromeos/login/user_manager.h" #include "chromeos/dbus/dbus_thread_manager.h" +#include "chromeos/dbus/fake_dbus_thread_manager.h" #include "chromeos/dbus/fake_power_manager_client.h" -#include "chromeos/dbus/mock_dbus_thread_manager_without_gmock.h" #endif using apps::ShellWindow; @@ -1240,8 +1240,8 @@ class RestartDeviceTest : public PlatformAppBrowserTest { virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { PlatformAppBrowserTest::SetUpInProcessBrowserTestFixture(); - chromeos::MockDBusThreadManagerWithoutGMock* dbus_manager = - new chromeos::MockDBusThreadManagerWithoutGMock; + chromeos::FakeDBusThreadManager* dbus_manager = + new chromeos::FakeDBusThreadManager; chromeos::DBusThreadManager::InitializeForTesting(dbus_manager); power_manager_client_ = dbus_manager->fake_power_manager_client(); } diff --git a/chrome/browser/chromeos/input_method/input_method_configuration_unittest.cc b/chrome/browser/chromeos/input_method/input_method_configuration_unittest.cc index a5aaae4..77bd6ae 100644 --- a/chrome/browser/chromeos/input_method/input_method_configuration_unittest.cc +++ b/chrome/browser/chromeos/input_method/input_method_configuration_unittest.cc @@ -5,7 +5,7 @@ #include "chrome/browser/chromeos/input_method/input_method_configuration.h" #include "chrome/browser/chromeos/input_method/mock_input_method_manager.h" #include "chromeos/dbus/dbus_thread_manager.h" -#include "chromeos/dbus/mock_dbus_thread_manager_without_gmock.h" +#include "chromeos/dbus/fake_dbus_thread_manager.h" #include "content/public/browser/browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" @@ -16,7 +16,7 @@ class InputMethodConfigurationTest : public testing::Test { public: virtual void SetUp() { chromeos::DBusThreadManager::InitializeForTesting( - new chromeos::MockDBusThreadManagerWithoutGMock()); + new chromeos::FakeDBusThreadManager()); } virtual void TearDown() { diff --git a/chrome/browser/chromeos/input_method/input_method_manager_impl_unittest.cc b/chrome/browser/chromeos/input_method/input_method_manager_impl_unittest.cc index cd5c49b..45f3780 100644 --- a/chrome/browser/chromeos/input_method/input_method_manager_impl_unittest.cc +++ b/chrome/browser/chromeos/input_method/input_method_manager_impl_unittest.cc @@ -15,8 +15,8 @@ #include "base/message_loop/message_loop.h" #include "chrome/browser/chromeos/input_method/mock_candidate_window_controller.h" #include "chrome/browser/chromeos/input_method/mock_ibus_controller.h" +#include "chromeos/dbus/fake_dbus_thread_manager.h" #include "chromeos/dbus/ibus/mock_ibus_client.h" -#include "chromeos/dbus/mock_dbus_thread_manager_without_gmock.h" #include "chromeos/ime/extension_ime_util.h" #include "chromeos/ime/fake_input_method_delegate.h" #include "chromeos/ime/mock_component_extension_ime_manager_delegate.h" @@ -61,10 +61,10 @@ class InputMethodManagerImplTest : public testing::Test { mock_ibus_daemon_controller_ = new chromeos::MockIBusDaemonController(); chromeos::IBusDaemonController::InitializeForTesting( mock_ibus_daemon_controller_); - mock_dbus_thread_manager_ = - new chromeos::MockDBusThreadManagerWithoutGMock(); + fake_dbus_thread_manager_ = + new chromeos::FakeDBusThreadManager(); chromeos::DBusThreadManager::InitializeForTesting( - mock_dbus_thread_manager_); + fake_dbus_thread_manager_); delegate_ = new FakeInputMethodDelegate(); manager_.reset(new InputMethodManagerImpl( scoped_ptr<InputMethodDelegate>(delegate_))); @@ -151,9 +151,9 @@ class InputMethodManagerImplTest : public testing::Test { // Helper function to initialize IBus bus connection for testing. Do not use // ibus related mocks before calling this function. void InitIBusBus() { - mock_dbus_thread_manager_->InitIBusBus("dummy address", + fake_dbus_thread_manager_->InitIBusBus("dummy address", base::Bind(&base::DoNothing)); - mock_ibus_client_ = mock_dbus_thread_manager_->mock_ibus_client(); + mock_ibus_client_ = fake_dbus_thread_manager_->mock_ibus_client(); mock_ibus_daemon_controller_->EmulateConnect(); } @@ -164,7 +164,7 @@ class InputMethodManagerImplTest : public testing::Test { MockIBusDaemonController* mock_ibus_daemon_controller_; scoped_ptr<MockIMEEngineHandler> mock_engine_handler_; MockIBusClient* mock_ibus_client_; - MockDBusThreadManagerWithoutGMock* mock_dbus_thread_manager_; + FakeDBusThreadManager* fake_dbus_thread_manager_; MockXKeyboard* xkeyboard_; base::MessageLoop message_loop_; MockComponentExtIMEManagerDelegate* mock_delegate_; diff --git a/chrome/browser/chromeos/login/crash_restore_browsertest.cc b/chrome/browser/chromeos/login/crash_restore_browsertest.cc index 6062fd8..d956d39 100644 --- a/chrome/browser/chromeos/login/crash_restore_browsertest.cc +++ b/chrome/browser/chromeos/login/crash_restore_browsertest.cc @@ -14,8 +14,8 @@ #include "chrome/test/base/in_process_browser_test.h" #include "chromeos/chromeos_switches.h" #include "chromeos/dbus/cryptohome_client.h" +#include "chromeos/dbus/fake_dbus_thread_manager.h" #include "chromeos/dbus/fake_session_manager_client.h" -#include "chromeos/dbus/mock_dbus_thread_manager_without_gmock.h" #include "chromeos/dbus/session_manager_client.h" #include "content/public/test/test_utils.h" #include "testing/gmock/include/gmock/gmock.h" @@ -47,8 +47,8 @@ class CrashRestoreSimpleTest : public InProcessBrowserTest { virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { // Redirect session_manager DBus calls to FakeSessionManagerClient. - MockDBusThreadManagerWithoutGMock* dbus_thread_manager = - new MockDBusThreadManagerWithoutGMock(); + FakeDBusThreadManager* dbus_thread_manager = + new FakeDBusThreadManager(); session_manager_client_ = dbus_thread_manager->fake_session_manager_client(); DBusThreadManager::InitializeForTesting(dbus_thread_manager); diff --git a/chrome/browser/chromeos/login/login_utils_browsertest.cc b/chrome/browser/chromeos/login/login_utils_browsertest.cc index 98babbc..465b33e 100644 --- a/chrome/browser/chromeos/login/login_utils_browsertest.cc +++ b/chrome/browser/chromeos/login/login_utils_browsertest.cc @@ -44,7 +44,7 @@ #include "chromeos/chromeos_switches.h" #include "chromeos/cryptohome/mock_async_method_caller.h" #include "chromeos/cryptohome/system_salt_getter.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 "chromeos/disks/mock_disk_mount_manager.h" #include "chromeos/login/login_state.h" @@ -204,7 +204,7 @@ class LoginUtilsTest : public testing::Test, // DBusThreadManager should be initialized before io_thread_state_, as // DBusThreadManager is used from chromeos::ProxyConfigServiceImpl, // which is part of io_thread_state_. - DBusThreadManager::InitializeForTesting(&mock_dbus_thread_manager_); + DBusThreadManager::InitializeForTesting(&fake_dbus_thread_manager_); SystemSaltGetter::Initialize(); LoginState::Initialize(); @@ -467,7 +467,7 @@ class LoginUtilsTest : public testing::Test, scoped_ptr<content::TestBrowserThread> io_thread_; scoped_ptr<IOThread> io_thread_state_; - MockDBusThreadManagerWithoutGMock mock_dbus_thread_manager_; + FakeDBusThreadManager fake_dbus_thread_manager_; input_method::MockInputMethodManager* mock_input_method_manager_; disks::MockDiskMountManager mock_disk_mount_manager_; net::TestURLFetcherFactory test_url_fetcher_factory_; @@ -478,7 +478,7 @@ class LoginUtilsTest : public testing::Test, policy::BrowserPolicyConnector* connector_; - // Initialized after |mock_dbus_thread_manager_| is set up. + // Initialized after |fake_dbus_thread_manager_| is set up. scoped_ptr<ScopedTestDeviceSettingsService> test_device_settings_service_; scoped_ptr<ScopedTestCrosSettings> test_cros_settings_; scoped_ptr<ScopedTestUserManager> test_user_manager_; diff --git a/chrome/browser/chromeos/login/parallel_authenticator_unittest.cc b/chrome/browser/chromeos/login/parallel_authenticator_unittest.cc index 7038bfe..8b8ab4e 100644 --- a/chrome/browser/chromeos/login/parallel_authenticator_unittest.cc +++ b/chrome/browser/chromeos/login/parallel_authenticator_unittest.cc @@ -27,7 +27,7 @@ #include "chromeos/cryptohome/mock_async_method_caller.h" #include "chromeos/cryptohome/system_salt_getter.h" #include "chromeos/dbus/fake_cryptohome_client.h" -#include "chromeos/dbus/mock_dbus_thread_manager_without_gmock.h" +#include "chromeos/dbus/fake_dbus_thread_manager.h" #include "content/public/test/test_browser_thread_bundle.h" #include "google_apis/gaia/mock_url_fetcher_factory.h" #include "net/base/net_errors.h" @@ -54,7 +54,7 @@ class ParallelAuthenticatorTest : public testing::Test { FakeCryptohomeClient::GetStubSystemSalt()))), user_manager_enabler_(new MockUserManager), mock_caller_(NULL), - mock_dbus_thread_manager_(new MockDBusThreadManagerWithoutGMock) { + fake_dbus_thread_manager_(new FakeDBusThreadManager) { } virtual ~ParallelAuthenticatorTest() { @@ -67,8 +67,8 @@ class ParallelAuthenticatorTest : public testing::Test { mock_caller_ = new cryptohome::MockAsyncMethodCaller; cryptohome::AsyncMethodCaller::InitializeForTesting(mock_caller_); - // Ownership of mock_dbus_thread_manager_ is taken. - DBusThreadManager::InitializeForTesting(mock_dbus_thread_manager_); + // Ownership of fake_dbus_thread_manager_ is taken. + DBusThreadManager::InitializeForTesting(fake_dbus_thread_manager_); SystemSaltGetter::Initialize(); auth_ = new ParallelAuthenticator(&consumer_); @@ -200,7 +200,7 @@ class ParallelAuthenticatorTest : public testing::Test { MockConsumer consumer_; scoped_refptr<ParallelAuthenticator> auth_; scoped_ptr<TestAttemptState> state_; - MockDBusThreadManagerWithoutGMock* mock_dbus_thread_manager_; + FakeDBusThreadManager* fake_dbus_thread_manager_; }; TEST_F(ParallelAuthenticatorTest, OnLoginSuccess) { @@ -290,7 +290,7 @@ TEST_F(ParallelAuthenticatorTest, ResolveOwnerNeededFailedMount) { ExpectLoginFailure(failure); FakeCryptohomeClient* fake_cryptohome_client = - mock_dbus_thread_manager_->fake_cryptohome_client(); + fake_dbus_thread_manager_->fake_cryptohome_client(); fake_cryptohome_client->set_unmount_result(true); CrosSettingsProvider* device_settings_provider; diff --git a/chrome/browser/chromeos/login/screen_locker_browsertest.cc b/chrome/browser/chromeos/login/screen_locker_browsertest.cc index df3c0a7..0b3ad8b 100644 --- a/chrome/browser/chromeos/login/screen_locker_browsertest.cc +++ b/chrome/browser/chromeos/login/screen_locker_browsertest.cc @@ -19,8 +19,8 @@ #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" #include "chromeos/chromeos_switches.h" +#include "chromeos/dbus/fake_dbus_thread_manager.h" #include "chromeos/dbus/fake_session_manager_client.h" -#include "chromeos/dbus/mock_dbus_thread_manager_without_gmock.h" #include "content/public/browser/notification_service.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" @@ -116,12 +116,12 @@ class ScreenLockerTest : public InProcessBrowserTest { private: virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { - MockDBusThreadManagerWithoutGMock* mock_dbus_thread_manager = - new MockDBusThreadManagerWithoutGMock; - DBusThreadManager::InitializeForTesting(mock_dbus_thread_manager); + FakeDBusThreadManager* fake_dbus_thread_manager = + new FakeDBusThreadManager; + DBusThreadManager::InitializeForTesting(fake_dbus_thread_manager); InProcessBrowserTest::SetUpInProcessBrowserTestFixture(); fake_session_manager_client_ = - mock_dbus_thread_manager->fake_session_manager_client(); + fake_dbus_thread_manager->fake_session_manager_client(); zero_duration_mode_.reset(new ui::ScopedAnimationDurationScaleMode( ui::ScopedAnimationDurationScaleMode::ZERO_DURATION)); } diff --git a/chrome/browser/chromeos/login/screens/network_screen_browsertest.cc b/chrome/browser/chromeos/login/screens/network_screen_browsertest.cc index a69145b..94af181 100644 --- a/chrome/browser/chromeos/login/screens/network_screen_browsertest.cc +++ b/chrome/browser/chromeos/login/screens/network_screen_browsertest.cc @@ -10,8 +10,8 @@ #include "chrome/browser/chromeos/login/wizard_controller.h" #include "chrome/browser/chromeos/login/wizard_in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" +#include "chromeos/dbus/fake_dbus_thread_manager.h" #include "chromeos/dbus/fake_session_manager_client.h" -#include "chromeos/dbus/mock_dbus_thread_manager_without_gmock.h" #include "content/public/test/test_utils.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" @@ -53,11 +53,11 @@ class NetworkScreenTest : public WizardInProcessBrowserTest { virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { WizardInProcessBrowserTest::SetUpInProcessBrowserTestFixture(); - MockDBusThreadManagerWithoutGMock* mock_dbus_thread_manager = - new MockDBusThreadManagerWithoutGMock; - DBusThreadManager::InitializeForTesting(mock_dbus_thread_manager); + FakeDBusThreadManager* fake_dbus_thread_manager = + new FakeDBusThreadManager; + DBusThreadManager::InitializeForTesting(fake_dbus_thread_manager); fake_session_manager_client_ = - mock_dbus_thread_manager->fake_session_manager_client(); + fake_dbus_thread_manager->fake_session_manager_client(); } virtual void SetUpOnMainThread() OVERRIDE { diff --git a/chrome/browser/chromeos/login/screens/update_screen_browsertest.cc b/chrome/browser/chromeos/login/screens/update_screen_browsertest.cc index 0935de6..f025c94 100644 --- a/chrome/browser/chromeos/login/screens/update_screen_browsertest.cc +++ b/chrome/browser/chromeos/login/screens/update_screen_browsertest.cc @@ -12,8 +12,8 @@ #include "chrome/browser/chromeos/net/network_portal_detector.h" #include "chrome/browser/chromeos/net/network_portal_detector_stub.h" #include "chromeos/chromeos_switches.h" +#include "chromeos/dbus/fake_dbus_thread_manager.h" #include "chromeos/dbus/fake_update_engine_client.h" -#include "chromeos/dbus/mock_dbus_thread_manager_without_gmock.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" @@ -42,13 +42,13 @@ class UpdateScreenTest : public WizardInProcessBrowserTest { protected: virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { - MockDBusThreadManagerWithoutGMock* mock_dbus_thread_manager = - new MockDBusThreadManagerWithoutGMock; - DBusThreadManager::InitializeForTesting(mock_dbus_thread_manager); + FakeDBusThreadManager* fake_dbus_thread_manager = + new FakeDBusThreadManager; + DBusThreadManager::InitializeForTesting(fake_dbus_thread_manager); WizardInProcessBrowserTest::SetUpInProcessBrowserTestFixture(); fake_update_engine_client_ - = mock_dbus_thread_manager->fake_update_engine_client(); + = fake_dbus_thread_manager->fake_update_engine_client(); // Setup network portal detector to return online state for both // ethernet and wifi networks. Ethernet is an active network by diff --git a/chrome/browser/chromeos/login/wizard_controller_browsertest.cc b/chrome/browser/chromeos/login/wizard_controller_browsertest.cc index d416b80..79b278f 100644 --- a/chrome/browser/chromeos/login/wizard_controller_browsertest.cc +++ b/chrome/browser/chromeos/login/wizard_controller_browsertest.cc @@ -42,8 +42,8 @@ #include "chromeos/chromeos_switches.h" #include "chromeos/chromeos_test_utils.h" #include "chromeos/dbus/dbus_thread_manager.h" +#include "chromeos/dbus/fake_dbus_thread_manager.h" #include "chromeos/dbus/fake_session_manager_client.h" -#include "chromeos/dbus/mock_dbus_thread_manager_without_gmock.h" #include "chromeos/network/network_state_handler.h" #include "content/public/test/browser_test_utils.h" #include "content/public/test/test_utils.h" @@ -408,11 +408,11 @@ class WizardControllerBrokenLocalStateTest : public WizardControllerTest { virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { WizardControllerTest::SetUpInProcessBrowserTestFixture(); - MockDBusThreadManagerWithoutGMock* mock_dbus_thread_manager = - new MockDBusThreadManagerWithoutGMock(); + FakeDBusThreadManager* fake_dbus_thread_manager = + new FakeDBusThreadManager(); fake_session_manager_client_ = - mock_dbus_thread_manager->fake_session_manager_client(); - DBusThreadManager::InitializeForTesting(mock_dbus_thread_manager); + fake_dbus_thread_manager->fake_session_manager_client(); + DBusThreadManager::InitializeForTesting(fake_dbus_thread_manager); } virtual void SetUpOnMainThread() OVERRIDE { diff --git a/chrome/browser/chromeos/policy/device_policy_cros_browser_test.cc b/chrome/browser/chromeos/policy/device_policy_cros_browser_test.cc index 9305837..26065eb 100644 --- a/chrome/browser/chromeos/policy/device_policy_cros_browser_test.cc +++ b/chrome/browser/chromeos/policy/device_policy_cros_browser_test.cc @@ -15,8 +15,8 @@ #include "chrome/browser/chromeos/policy/enterprise_install_attributes.h" #include "chrome/browser/policy/proto/chromeos/install_attributes.pb.h" #include "chromeos/chromeos_paths.h" +#include "chromeos/dbus/fake_dbus_thread_manager.h" #include "chromeos/dbus/fake_session_manager_client.h" -#include "chromeos/dbus/mock_dbus_thread_manager_without_gmock.h" #include "crypto/rsa_private_key.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" @@ -72,15 +72,15 @@ void DevicePolicyCrosTestHelper::InstallOwnerKey() { } DevicePolicyCrosBrowserTest::DevicePolicyCrosBrowserTest() - : mock_dbus_thread_manager_( - new chromeos::MockDBusThreadManagerWithoutGMock) { + : fake_dbus_thread_manager_( + new chromeos::FakeDBusThreadManager) { } DevicePolicyCrosBrowserTest::~DevicePolicyCrosBrowserTest() { } void DevicePolicyCrosBrowserTest::SetUpInProcessBrowserTestFixture() { - chromeos::DBusThreadManager::InitializeForTesting(mock_dbus_thread_manager_); + chromeos::DBusThreadManager::InitializeForTesting(fake_dbus_thread_manager_); InProcessBrowserTest::SetUpInProcessBrowserTestFixture(); } diff --git a/chrome/browser/chromeos/policy/device_policy_cros_browser_test.h b/chrome/browser/chromeos/policy/device_policy_cros_browser_test.h index 1a0dafc..afe39ba 100644 --- a/chrome/browser/chromeos/policy/device_policy_cros_browser_test.h +++ b/chrome/browser/chromeos/policy/device_policy_cros_browser_test.h @@ -10,7 +10,7 @@ #include "base/files/scoped_temp_dir.h" #include "chrome/browser/chromeos/policy/device_policy_builder.h" #include "chrome/test/base/in_process_browser_test.h" -#include "chromeos/dbus/mock_dbus_thread_manager_without_gmock.h" +#include "chromeos/dbus/fake_dbus_thread_manager.h" namespace chromeos { class FakeSessionManagerClient; @@ -64,12 +64,12 @@ class DevicePolicyCrosBrowserTest : public InProcessBrowserTest { // recently changed). void RefreshDevicePolicy(); - chromeos::MockDBusThreadManagerWithoutGMock* mock_dbus_thread_manager() { - return mock_dbus_thread_manager_; + chromeos::FakeDBusThreadManager* fake_dbus_thread_manager() { + return fake_dbus_thread_manager_; } chromeos::FakeSessionManagerClient* session_manager_client() { - return mock_dbus_thread_manager_->fake_session_manager_client(); + return fake_dbus_thread_manager_->fake_session_manager_client(); } DevicePolicyBuilder* device_policy() { return test_helper_.device_policy(); } @@ -77,8 +77,8 @@ class DevicePolicyCrosBrowserTest : public InProcessBrowserTest { private: DevicePolicyCrosTestHelper test_helper_; - // MockDBusThreadManagerWithoutGMock uses FakeSessionManagerClient. - chromeos::MockDBusThreadManagerWithoutGMock* mock_dbus_thread_manager_; + // FakeDBusThreadManager uses FakeSessionManagerClient. + chromeos::FakeDBusThreadManager* fake_dbus_thread_manager_; DISALLOW_COPY_AND_ASSIGN(DevicePolicyCrosBrowserTest); }; diff --git a/chrome/browser/chromeos/policy/power_policy_browsertest.cc b/chrome/browser/chromeos/policy/power_policy_browsertest.cc index b00064f..28365d3 100644 --- a/chrome/browser/chromeos/policy/power_policy_browsertest.cc +++ b/chrome/browser/chromeos/policy/power_policy_browsertest.cc @@ -44,9 +44,9 @@ #include "chromeos/chromeos_paths.h" #include "chromeos/chromeos_switches.h" #include "chromeos/dbus/cryptohome_client.h" +#include "chromeos/dbus/fake_dbus_thread_manager.h" #include "chromeos/dbus/fake_power_manager_client.h" #include "chromeos/dbus/fake_session_manager_client.h" -#include "chromeos/dbus/mock_dbus_thread_manager_without_gmock.h" #include "chromeos/dbus/power_manager/policy.pb.h" #include "chromeos/dbus/power_policy_controller.h" #include "content/public/browser/notification_details.h" @@ -158,7 +158,7 @@ void PowerPolicyBrowserTestBase::SetUpInProcessBrowserTestFixture() { MarkAsEnterpriseOwned(); power_manager_client_ = - mock_dbus_thread_manager()->fake_power_manager_client(); + fake_dbus_thread_manager()->fake_power_manager_client(); } void PowerPolicyBrowserTestBase::SetUpOnMainThread() { diff --git a/chrome/browser/chromeos/power/peripheral_battery_observer_browsertest.cc b/chrome/browser/chromeos/power/peripheral_battery_observer_browsertest.cc index 4e8a0a2..d29045a 100644 --- a/chrome/browser/chromeos/power/peripheral_battery_observer_browsertest.cc +++ b/chrome/browser/chromeos/power/peripheral_battery_observer_browsertest.cc @@ -9,7 +9,7 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/notifications/notification_ui_manager.h" #include "chrome/test/base/in_process_browser_test.h" -#include "chromeos/dbus/mock_dbus_thread_manager_without_gmock.h" +#include "chromeos/dbus/fake_dbus_thread_manager.h" #include "content/public/browser/browser_thread.h" #include "content/public/test/test_browser_thread.h" #include "content/public/test/test_utils.h" @@ -37,9 +37,9 @@ class PeripheralBatteryObserverTest : public InProcessBrowserTest { virtual ~PeripheralBatteryObserverTest () {} virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { - MockDBusThreadManagerWithoutGMock* mock_dbus_thread_manager = - new MockDBusThreadManagerWithoutGMock; - DBusThreadManager::InitializeForTesting(mock_dbus_thread_manager); + FakeDBusThreadManager* fake_dbus_thread_manager = + new FakeDBusThreadManager; + DBusThreadManager::InitializeForTesting(fake_dbus_thread_manager); InProcessBrowserTest::SetUpInProcessBrowserTestFixture(); } diff --git a/chrome/browser/chromeos/power/power_prefs_unittest.cc b/chrome/browser/chromeos/power/power_prefs_unittest.cc index 7a28e04..3c040e5 100644 --- a/chrome/browser/chromeos/power/power_prefs_unittest.cc +++ b/chrome/browser/chromeos/power/power_prefs_unittest.cc @@ -23,8 +23,8 @@ #include "chrome/test/base/testing_profile.h" #include "chrome/test/base/testing_profile_manager.h" #include "chromeos/chromeos_switches.h" +#include "chromeos/dbus/fake_dbus_thread_manager.h" #include "chromeos/dbus/fake_power_manager_client.h" -#include "chromeos/dbus/mock_dbus_thread_manager_without_gmock.h" #include "chromeos/dbus/power_manager/policy.pb.h" #include "chromeos/dbus/power_policy_controller.h" #include "components/user_prefs/pref_registry_syncable.h" @@ -51,7 +51,7 @@ class PowerPrefsTest : public testing::Test { bool GetCurrentAllowScreenWakeLocks() const; TestingProfileManager profile_manager_; - MockDBusThreadManagerWithoutGMock mock_dbus_thread_manager_; + FakeDBusThreadManager fake_dbus_thread_manager_; PowerPolicyController* power_policy_controller_; // Not owned. FakePowerManagerClient* fake_power_manager_client_; // Not owned. @@ -63,9 +63,9 @@ class PowerPrefsTest : public testing::Test { PowerPrefsTest::PowerPrefsTest() : profile_manager_(TestingBrowserProcess::GetGlobal()), power_policy_controller_( - mock_dbus_thread_manager_.GetPowerPolicyController()), + fake_dbus_thread_manager_.GetPowerPolicyController()), fake_power_manager_client_( - mock_dbus_thread_manager_.fake_power_manager_client()) { + fake_dbus_thread_manager_.fake_power_manager_client()) { } void PowerPrefsTest::SetUp() { diff --git a/chrome/browser/chromeos/settings/device_oauth2_token_service_unittest.cc b/chrome/browser/chromeos/settings/device_oauth2_token_service_unittest.cc index 7f0a78d..dd4b246 100644 --- a/chrome/browser/chromeos/settings/device_oauth2_token_service_unittest.cc +++ b/chrome/browser/chromeos/settings/device_oauth2_token_service_unittest.cc @@ -12,7 +12,7 @@ #include "chrome/test/base/scoped_testing_local_state.h" #include "chrome/test/base/testing_browser_process.h" #include "chromeos/cryptohome/system_salt_getter.h" -#include "chromeos/dbus/mock_dbus_thread_manager_without_gmock.h" +#include "chromeos/dbus/fake_dbus_thread_manager.h" #include "content/public/browser/browser_thread.h" #include "content/public/test/test_browser_thread.h" #include "google_apis/gaia/gaia_oauth_client.h" @@ -101,9 +101,9 @@ class DeviceOAuth2TokenServiceTest : public testing::Test { virtual void SetUp() OVERRIDE { // TODO(xiyuan): Remove this when cleaning up the system salt load temp fix. - scoped_ptr<MockDBusThreadManagerWithoutGMock> mock_dbus_thread_manager( - new MockDBusThreadManagerWithoutGMock); - DBusThreadManager::InitializeForTesting(mock_dbus_thread_manager.release()); + scoped_ptr<FakeDBusThreadManager> fake_dbus_thread_manager( + new FakeDBusThreadManager); + DBusThreadManager::InitializeForTesting(fake_dbus_thread_manager.release()); SystemSaltGetter::Initialize(); } diff --git a/chrome/browser/chromeos/system/automatic_reboot_manager_unittest.cc b/chrome/browser/chromeos/system/automatic_reboot_manager_unittest.cc index 7aac719..4ea30aa 100644 --- a/chrome/browser/chromeos/system/automatic_reboot_manager_unittest.cc +++ b/chrome/browser/chromeos/system/automatic_reboot_manager_unittest.cc @@ -33,9 +33,9 @@ #include "chrome/test/base/testing_browser_process.h" #include "chromeos/chromeos_paths.h" #include "chromeos/dbus/dbus_thread_manager.h" +#include "chromeos/dbus/fake_dbus_thread_manager.h" #include "chromeos/dbus/fake_power_manager_client.h" #include "chromeos/dbus/fake_update_engine_client.h" -#include "chromeos/dbus/mock_dbus_thread_manager_without_gmock.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_service.h" @@ -358,8 +358,7 @@ void AutomaticRebootManagerBasicTest::SetUp() { TestingBrowserProcess::GetGlobal()->SetLocalState(&local_state_); AutomaticRebootManager::RegisterPrefs(local_state_.registry()); - MockDBusThreadManagerWithoutGMock* dbus_manager = - new MockDBusThreadManagerWithoutGMock; + FakeDBusThreadManager* dbus_manager = new FakeDBusThreadManager; DBusThreadManager::InitializeForTesting(dbus_manager); power_manager_client_ = dbus_manager->fake_power_manager_client(); update_engine_client_ = dbus_manager->fake_update_engine_client(); diff --git a/chrome/browser/extensions/api/system_private/system_private_apitest.cc b/chrome/browser/extensions/api/system_private/system_private_apitest.cc index 6e3d341..74f9266 100644 --- a/chrome/browser/extensions/api/system_private/system_private_apitest.cc +++ b/chrome/browser/extensions/api/system_private/system_private_apitest.cc @@ -9,8 +9,8 @@ #include "chrome/common/pref_names.h" #if defined(OS_CHROMEOS) +#include "chromeos/dbus/fake_dbus_thread_manager.h" #include "chromeos/dbus/fake_update_engine_client.h" -#include "chromeos/dbus/mock_dbus_thread_manager_without_gmock.h" using chromeos::UpdateEngineClient; #endif @@ -31,11 +31,11 @@ class GetUpdateStatusApiTest : public ExtensionApiTest { virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { ExtensionApiTest::SetUpInProcessBrowserTestFixture(); - chromeos::MockDBusThreadManagerWithoutGMock* mock_dbus_thread_manager = - new chromeos::MockDBusThreadManagerWithoutGMock; - chromeos::DBusThreadManager::InitializeForTesting(mock_dbus_thread_manager); + chromeos::FakeDBusThreadManager* fake_dbus_thread_manager = + new chromeos::FakeDBusThreadManager; + chromeos::DBusThreadManager::InitializeForTesting(fake_dbus_thread_manager); fake_update_engine_client_ = - mock_dbus_thread_manager->fake_update_engine_client(); + fake_dbus_thread_manager->fake_update_engine_client(); } virtual void TearDownInProcessBrowserTestFixture() OVERRIDE { diff --git a/chrome/browser/metrics/metrics_log_unittest.cc b/chrome/browser/metrics/metrics_log_unittest.cc index 2676dbf..0f96916 100644 --- a/chrome/browser/metrics/metrics_log_unittest.cc +++ b/chrome/browser/metrics/metrics_log_unittest.cc @@ -38,7 +38,7 @@ #if defined(OS_CHROMEOS) #include "chrome/browser/chromeos/login/fake_user_manager.h" #include "chrome/browser/chromeos/login/user_manager.h" -#include "chromeos/dbus/mock_dbus_thread_manager_without_gmock.h" +#include "chromeos/dbus/fake_dbus_thread_manager.h" #endif // OS_CHROMEOS using base::TimeDelta; @@ -176,10 +176,9 @@ class MetricsLogTest : public testing::Test { virtual void SetUp() OVERRIDE { #if defined(OS_CHROMEOS) - mock_dbus_thread_manager_ = - new chromeos::MockDBusThreadManagerWithoutGMock(); + fake_dbus_thread_manager_ = new chromeos::FakeDBusThreadManager(); chromeos::DBusThreadManager::InitializeForTesting( - mock_dbus_thread_manager_); + fake_dbus_thread_manager_); // Enable multi-profiles. CommandLine::ForCurrentProcess()->AppendSwitch(switches::kMultiProfiles); @@ -208,7 +207,7 @@ class MetricsLogTest : public testing::Test { base::MessageLoop message_loop_; #if defined(OS_CHROMEOS) - chromeos::MockDBusThreadManagerWithoutGMock* mock_dbus_thread_manager_; + chromeos::FakeDBusThreadManager* fake_dbus_thread_manager_; scoped_ptr<base::FieldTrialList> field_trial_list_; #endif // OS_CHROMEOS }; diff --git a/chromeos/chromeos.gyp b/chromeos/chromeos.gyp index 03b6cf4..c7ce72d 100644 --- a/chromeos/chromeos.gyp +++ b/chromeos/chromeos.gyp @@ -407,6 +407,8 @@ 'sources': [ 'dbus/fake_cros_disks_client.cc', 'dbus/fake_cros_disks_client.h', + 'dbus/fake_dbus_thread_manager.cc', + 'dbus/fake_dbus_thread_manager.h', 'dbus/fake_power_manager_client.cc', 'dbus/fake_power_manager_client.h', 'dbus/fake_session_manager_client.cc', @@ -415,8 +417,6 @@ 'dbus/fake_shill_manager_client.h', 'dbus/fake_update_engine_client.cc', 'dbus/fake_update_engine_client.h', - 'dbus/mock_dbus_thread_manager_without_gmock.cc', - 'dbus/mock_dbus_thread_manager_without_gmock.h', 'dbus/ibus/mock_ibus_client.cc', 'dbus/ibus/mock_ibus_client.h', 'dbus/ibus/mock_ibus_engine_factory_service.cc', diff --git a/chromeos/dbus/mock_dbus_thread_manager_without_gmock.cc b/chromeos/dbus/fake_dbus_thread_manager.cc index af1d231..4378d1c 100644 --- a/chromeos/dbus/mock_dbus_thread_manager_without_gmock.cc +++ b/chromeos/dbus/fake_dbus_thread_manager.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chromeos/dbus/mock_dbus_thread_manager_without_gmock.h" +#include "chromeos/dbus/fake_dbus_thread_manager.h" #include "chromeos/dbus/dbus_thread_manager_observer.h" #include "chromeos/dbus/fake_bluetooth_adapter_client.h" @@ -27,7 +27,7 @@ namespace chromeos { -MockDBusThreadManagerWithoutGMock::MockDBusThreadManagerWithoutGMock() +FakeDBusThreadManager::FakeDBusThreadManager() : fake_bluetooth_adapter_client_(new FakeBluetoothAdapterClient()), fake_bluetooth_agent_manager_client_(new FakeBluetoothAgentManagerClient()), fake_bluetooth_device_client_(new FakeBluetoothDeviceClient()), @@ -49,24 +49,24 @@ MockDBusThreadManagerWithoutGMock::MockDBusThreadManagerWithoutGMock() new PowerPolicyController(this, fake_power_manager_client_.get())); } -MockDBusThreadManagerWithoutGMock::~MockDBusThreadManagerWithoutGMock() { +FakeDBusThreadManager::~FakeDBusThreadManager() { FOR_EACH_OBSERVER(DBusThreadManagerObserver, observers_, OnDBusThreadManagerDestroying(this)); } -void MockDBusThreadManagerWithoutGMock::AddObserver( +void FakeDBusThreadManager::AddObserver( DBusThreadManagerObserver* observer) { DCHECK(observer); observers_.AddObserver(observer); } -void MockDBusThreadManagerWithoutGMock::RemoveObserver( +void FakeDBusThreadManager::RemoveObserver( DBusThreadManagerObserver* observer) { DCHECK(observer); observers_.RemoveObserver(observer); } -void MockDBusThreadManagerWithoutGMock::InitIBusBus( +void FakeDBusThreadManager::InitIBusBus( const std::string& ibus_address, const base::Closure& closure) { // Non-null bus address is used to ensure the connection to ibus-daemon. @@ -76,152 +76,152 @@ void MockDBusThreadManagerWithoutGMock::InitIBusBus( mock_ibus_engine_factory_service_.reset(new MockIBusEngineFactoryService); } -dbus::Bus* MockDBusThreadManagerWithoutGMock::GetSystemBus() { +dbus::Bus* FakeDBusThreadManager::GetSystemBus() { return NULL; } -dbus::Bus* MockDBusThreadManagerWithoutGMock::GetIBusBus() { +dbus::Bus* FakeDBusThreadManager::GetIBusBus() { return ibus_bus_; } BluetoothAdapterClient* - MockDBusThreadManagerWithoutGMock::GetBluetoothAdapterClient() { + FakeDBusThreadManager::GetBluetoothAdapterClient() { return fake_bluetooth_adapter_client_.get(); } BluetoothAgentManagerClient* - MockDBusThreadManagerWithoutGMock::GetBluetoothAgentManagerClient() { + FakeDBusThreadManager::GetBluetoothAgentManagerClient() { return fake_bluetooth_agent_manager_client_.get(); } BluetoothDeviceClient* - MockDBusThreadManagerWithoutGMock::GetBluetoothDeviceClient() { + FakeDBusThreadManager::GetBluetoothDeviceClient() { return fake_bluetooth_device_client_.get(); } BluetoothInputClient* - MockDBusThreadManagerWithoutGMock::GetBluetoothInputClient() { + FakeDBusThreadManager::GetBluetoothInputClient() { return fake_bluetooth_input_client_.get(); } BluetoothProfileManagerClient* - MockDBusThreadManagerWithoutGMock::GetBluetoothProfileManagerClient() { + FakeDBusThreadManager::GetBluetoothProfileManagerClient() { return fake_bluetooth_profile_manager_client_.get(); } -CrasAudioClient* MockDBusThreadManagerWithoutGMock::GetCrasAudioClient() { +CrasAudioClient* FakeDBusThreadManager::GetCrasAudioClient() { return NULL; } -CrosDisksClient* MockDBusThreadManagerWithoutGMock::GetCrosDisksClient() { +CrosDisksClient* FakeDBusThreadManager::GetCrosDisksClient() { return fake_cros_disks_client_.get(); } -CryptohomeClient* MockDBusThreadManagerWithoutGMock::GetCryptohomeClient() { +CryptohomeClient* FakeDBusThreadManager::GetCryptohomeClient() { return fake_cryptohome_client_.get(); } -DebugDaemonClient* MockDBusThreadManagerWithoutGMock::GetDebugDaemonClient() { +DebugDaemonClient* FakeDBusThreadManager::GetDebugDaemonClient() { NOTIMPLEMENTED(); return NULL; } ShillDeviceClient* - MockDBusThreadManagerWithoutGMock::GetShillDeviceClient() { + FakeDBusThreadManager::GetShillDeviceClient() { return fake_shill_device_client_.get(); } ShillIPConfigClient* - MockDBusThreadManagerWithoutGMock::GetShillIPConfigClient() { + FakeDBusThreadManager::GetShillIPConfigClient() { NOTIMPLEMENTED(); return NULL; } ShillManagerClient* - MockDBusThreadManagerWithoutGMock::GetShillManagerClient() { + FakeDBusThreadManager::GetShillManagerClient() { return fake_shill_manager_client_.get(); } ShillProfileClient* - MockDBusThreadManagerWithoutGMock::GetShillProfileClient() { + FakeDBusThreadManager::GetShillProfileClient() { NOTIMPLEMENTED(); return NULL; } ShillServiceClient* - MockDBusThreadManagerWithoutGMock::GetShillServiceClient() { + FakeDBusThreadManager::GetShillServiceClient() { NOTIMPLEMENTED(); return NULL; } -GsmSMSClient* MockDBusThreadManagerWithoutGMock::GetGsmSMSClient() { +GsmSMSClient* FakeDBusThreadManager::GetGsmSMSClient() { return fake_gsm_sms_client_.get(); } -ImageBurnerClient* MockDBusThreadManagerWithoutGMock::GetImageBurnerClient() { +ImageBurnerClient* FakeDBusThreadManager::GetImageBurnerClient() { return fake_image_burner_client_.get(); } IntrospectableClient* - MockDBusThreadManagerWithoutGMock::GetIntrospectableClient() { + FakeDBusThreadManager::GetIntrospectableClient() { NOTIMPLEMENTED(); return NULL; } ModemMessagingClient* - MockDBusThreadManagerWithoutGMock::GetModemMessagingClient() { + FakeDBusThreadManager::GetModemMessagingClient() { NOTIMPLEMENTED(); return NULL; } PermissionBrokerClient* - MockDBusThreadManagerWithoutGMock::GetPermissionBrokerClient() { + FakeDBusThreadManager::GetPermissionBrokerClient() { NOTIMPLEMENTED(); return NULL; } -PowerManagerClient* MockDBusThreadManagerWithoutGMock::GetPowerManagerClient() { +PowerManagerClient* FakeDBusThreadManager::GetPowerManagerClient() { return fake_power_manager_client_.get(); } PowerPolicyController* -MockDBusThreadManagerWithoutGMock::GetPowerPolicyController() { +FakeDBusThreadManager::GetPowerPolicyController() { return power_policy_controller_.get(); } SessionManagerClient* - MockDBusThreadManagerWithoutGMock::GetSessionManagerClient() { + FakeDBusThreadManager::GetSessionManagerClient() { return fake_session_manager_client_.get(); } -SMSClient* MockDBusThreadManagerWithoutGMock::GetSMSClient() { +SMSClient* FakeDBusThreadManager::GetSMSClient() { NOTIMPLEMENTED(); return NULL; } -SystemClockClient* MockDBusThreadManagerWithoutGMock::GetSystemClockClient() { +SystemClockClient* FakeDBusThreadManager::GetSystemClockClient() { return fake_system_clock_client_.get(); } -UpdateEngineClient* MockDBusThreadManagerWithoutGMock::GetUpdateEngineClient() { +UpdateEngineClient* FakeDBusThreadManager::GetUpdateEngineClient() { return fake_update_engine_client_.get(); } -IBusClient* MockDBusThreadManagerWithoutGMock::GetIBusClient() { +IBusClient* FakeDBusThreadManager::GetIBusClient() { return mock_ibus_client_.get(); } IBusEngineFactoryService* - MockDBusThreadManagerWithoutGMock::GetIBusEngineFactoryService() { + FakeDBusThreadManager::GetIBusEngineFactoryService() { return mock_ibus_engine_factory_service_.get(); } -IBusEngineService* MockDBusThreadManagerWithoutGMock::GetIBusEngineService( +IBusEngineService* FakeDBusThreadManager::GetIBusEngineService( const dbus::ObjectPath& object_path) { return mock_ibus_engine_service_.get(); } -void MockDBusThreadManagerWithoutGMock::RemoveIBusEngineService( +void FakeDBusThreadManager::RemoveIBusEngineService( const dbus::ObjectPath& object_path) { } diff --git a/chromeos/dbus/mock_dbus_thread_manager_without_gmock.h b/chromeos/dbus/fake_dbus_thread_manager.h index f743dc4..13addee 100644 --- a/chromeos/dbus/mock_dbus_thread_manager_without_gmock.h +++ b/chromeos/dbus/fake_dbus_thread_manager.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROMEOS_DBUS_MOCK_DBUS_THREAD_MANAGER_WITHOUT_GMOCK_H_ -#define CHROMEOS_DBUS_MOCK_DBUS_THREAD_MANAGER_WITHOUT_GMOCK_H_ +#ifndef CHROMEOS_DBUS_FAKE_DBUS_THREAD_MANAGER_H_ +#define CHROMEOS_DBUS_FAKE_DBUS_THREAD_MANAGER_H_ #include <string> @@ -38,15 +38,12 @@ class MockIBusClient; class MockIBusEngineFactoryService; class MockIBusEngineService; -// This class provides an another mock DBusThreadManager without gmock -// dependency. This class is used for places where GMock is not allowed -// (ex. ui/) or is not used. -// TODO(haruki): Along with crbug.com/223061, we can rename this class to -// clarify that this can also provides fakes and stubs. -class MockDBusThreadManagerWithoutGMock : public DBusThreadManager { +// This class provides a fake implementation of DBusThreadManager, which +// hosts fake D-Bus clients. +class FakeDBusThreadManager : public DBusThreadManager { public: - MockDBusThreadManagerWithoutGMock(); - virtual ~MockDBusThreadManagerWithoutGMock(); + FakeDBusThreadManager(); + virtual ~FakeDBusThreadManager(); virtual void AddObserver(DBusThreadManagerObserver* observer) OVERRIDE; virtual void RemoveObserver(DBusThreadManagerObserver* observer) OVERRIDE; @@ -149,6 +146,7 @@ class MockDBusThreadManagerWithoutGMock : public DBusThreadManager { return fake_update_engine_client_.get(); } + // TODO(komatsu): Remove IBus related code. crbug.com/275262 MockIBusClient* mock_ibus_client() { return mock_ibus_client_.get(); } @@ -195,9 +193,9 @@ class MockDBusThreadManagerWithoutGMock : public DBusThreadManager { scoped_ptr<PowerPolicyController> power_policy_controller_; dbus::Bus* ibus_bus_; - DISALLOW_COPY_AND_ASSIGN(MockDBusThreadManagerWithoutGMock); + DISALLOW_COPY_AND_ASSIGN(FakeDBusThreadManager); }; } // namespace chromeos -#endif // CHROMEOS_DBUS_MOCK_DBUS_THREAD_MANAGER_WITHOUT_GMOCK_H_ +#endif // CHROMEOS_DBUS_FAKE_DBUS_THREAD_MANAGER_H_ diff --git a/chromeos/dbus/power_policy_controller_unittest.cc b/chromeos/dbus/power_policy_controller_unittest.cc index d8f7078..44dd59f 100644 --- a/chromeos/dbus/power_policy_controller_unittest.cc +++ b/chromeos/dbus/power_policy_controller_unittest.cc @@ -6,8 +6,8 @@ #include "base/memory/scoped_ptr.h" #include "chromeos/dbus/dbus_thread_manager.h" +#include "chromeos/dbus/fake_dbus_thread_manager.h" #include "chromeos/dbus/fake_power_manager_client.h" -#include "chromeos/dbus/mock_dbus_thread_manager_without_gmock.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" @@ -22,7 +22,7 @@ class PowerPolicyControllerTest : public testing::Test { virtual ~PowerPolicyControllerTest() {} virtual void SetUp() OVERRIDE { - dbus_manager_ = new MockDBusThreadManagerWithoutGMock; + dbus_manager_ = new FakeDBusThreadManager; DBusThreadManager::InitializeForTesting(dbus_manager_); // Takes ownership. policy_controller_.reset( @@ -35,7 +35,7 @@ class PowerPolicyControllerTest : public testing::Test { } protected: - MockDBusThreadManagerWithoutGMock* dbus_manager_; // Not owned. + FakeDBusThreadManager* dbus_manager_; // Not owned. FakePowerManagerClient fake_power_client_; scoped_ptr<PowerPolicyController> policy_controller_; }; 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 - 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<BluetoothAdapter> 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<BluetoothAdapter> adapter_; unsigned int callback_count_; diff --git a/ui/base/ime/input_method_ibus_unittest.cc b/ui/base/ime/input_method_ibus_unittest.cc index a43e90f..c691835 100644 --- a/ui/base/ime/input_method_ibus_unittest.cc +++ b/ui/base/ime/input_method_ibus_unittest.cc @@ -16,7 +16,6 @@ #include "chromeos/dbus/dbus_thread_manager.h" #include "chromeos/dbus/ibus/ibus_text.h" #include "chromeos/dbus/ibus/mock_ibus_client.h" -#include "chromeos/dbus/mock_dbus_thread_manager_without_gmock.h" #include "chromeos/ime/ibus_bridge.h" #include "chromeos/ime/mock_ime_candidate_window_handler.h" #include "chromeos/ime/mock_ime_engine_handler.h" |