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

5 files changed, 57 insertions, 61 deletions

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
-