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

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();
   }

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() {

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_;

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);

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_;

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;

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));
   }

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 {

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

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 {

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();
 }
 

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,21 +64,21 @@ 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(); }
 
  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);
 };

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() {