Rename CrasAudioClientStubImpl to FakeCrasAudioClient

CrasAudioClientStubImpl has some fake-ish behavors
(ex. SetAudioNodesForTesting). Besides other similar classes in the
directory are named FakeWhateverClient.

BUG=309506
TEST=none

Review URL: https://codereview.chromium.org/675403002

Cr-Commit-Position: refs/heads/master@{#301377}

chromeos/audio/cras_audio_handler_unittest.cc

@@ -10,8 +10,8 @@
 #include "base/values.h"
 #include "chromeos/audio/audio_devices_pref_handler_stub.h"
 #include "chromeos/dbus/audio_node.h"
-#include "chromeos/dbus/cras_audio_client_stub_impl.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
+#include "chromeos/dbus/fake_cras_audio_client.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace chromeos {
@@ -236,7 +236,7 @@ class TestObserver : public chromeos::CrasAudioHandler::AudioObserver {
 class CrasAudioHandlerTest : public testing::Test {
  public:
   CrasAudioHandlerTest() : cras_audio_handler_(NULL),
-                           cras_audio_client_stub_(NULL) {
+                           fake_cras_audio_client_(NULL) {
   }
   virtual ~CrasAudioHandlerTest() {}
 
@@ -253,9 +253,9 @@ class CrasAudioHandlerTest : public testing::Test {
 
   void SetUpCrasAudioHandler(const AudioNodeList& audio_nodes) {
     DBusThreadManager::Initialize();
-    cras_audio_client_stub_ = static_cast<CrasAudioClientStubImpl*>(
+    fake_cras_audio_client_ = static_cast<FakeCrasAudioClient*>(
         DBusThreadManager::Get()->GetCrasAudioClient());
-    cras_audio_client_stub_->SetAudioNodesForTesting(audio_nodes);
+    fake_cras_audio_client_->SetAudioNodesForTesting(audio_nodes);
     audio_pref_handler_ = new AudioDevicesPrefHandlerStub();
     CrasAudioHandler::Initialize(audio_pref_handler_);
     cras_audio_handler_ = CrasAudioHandler::Get();
@@ -268,10 +268,10 @@ class CrasAudioHandlerTest : public testing::Test {
       const AudioNodeList& audio_nodes,
       const AudioNode& primary_active_node) {
     DBusThreadManager::Initialize();
-    cras_audio_client_stub_ = static_cast<CrasAudioClientStubImpl*>(
+    fake_cras_audio_client_ = static_cast<FakeCrasAudioClient*>(
         DBusThreadManager::Get()->GetCrasAudioClient());
-    cras_audio_client_stub_->SetAudioNodesForTesting(audio_nodes);
-    cras_audio_client_stub_->SetActiveOutputNode(primary_active_node.id),
+    fake_cras_audio_client_->SetAudioNodesForTesting(audio_nodes);
+    fake_cras_audio_client_->SetActiveOutputNode(primary_active_node.id),
         audio_pref_handler_ = new AudioDevicesPrefHandlerStub();
     CrasAudioHandler::Initialize(audio_pref_handler_);
     cras_audio_handler_ = CrasAudioHandler::Get();
@@ -281,7 +281,7 @@ class CrasAudioHandlerTest : public testing::Test {
   }
 
   void ChangeAudioNodes(const AudioNodeList& audio_nodes) {
-    cras_audio_client_stub_->SetAudioNodesAndNotifyObserversForTesting(
+    fake_cras_audio_client_->SetAudioNodesAndNotifyObserversForTesting(
         audio_nodes);
     message_loop_.RunUntilIdle();
   }
@@ -293,7 +293,7 @@ class CrasAudioHandlerTest : public testing::Test {
  protected:
   base::MessageLoopForUI message_loop_;
   CrasAudioHandler* cras_audio_handler_;  // Not owned.
-  CrasAudioClientStubImpl* cras_audio_client_stub_;  // Not owned.
+  FakeCrasAudioClient* fake_cras_audio_client_;  // Not owned.
   scoped_ptr<TestObserver> test_observer_;
   scoped_refptr<AudioDevicesPrefHandlerStub> audio_pref_handler_;
 

chromeos/chromeos.gyp

@@ -77,8 +77,6 @@
       'dbus/bluetooth_profile_service_provider.h',
       'dbus/cras_audio_client.cc',
       'dbus/cras_audio_client.h',
-      'dbus/cras_audio_client_stub_impl.cc',
-      'dbus/cras_audio_client_stub_impl.h',
       'dbus/cros_disks_client.cc',
       'dbus/cros_disks_client.h',
       'dbus/cryptohome_client.cc',
@@ -122,6 +120,8 @@
       'dbus/fake_bluetooth_profile_manager_client.h',
       'dbus/fake_bluetooth_profile_service_provider.cc',
       'dbus/fake_bluetooth_profile_service_provider.h',
+      'dbus/fake_cras_audio_client.cc',
+      'dbus/fake_cras_audio_client.h',
       'dbus/fake_cryptohome_client.cc',
       'dbus/fake_cryptohome_client.h',
       'dbus/fake_debug_daemon_client.cc',

chromeos/dbus/cras_audio_client.cc

@@ -7,7 +7,6 @@
 #include "base/bind.h"
 #include "base/format_macros.h"
 #include "base/strings/stringprintf.h"
-#include "chromeos/dbus/cras_audio_client_stub_impl.h"
 #include "dbus/bus.h"
 #include "dbus/message.h"
 #include "dbus/object_path.h"

chromeos/dbus/dbus_client_bundle.cc

@@ -18,7 +18,6 @@
 #include "chromeos/dbus/bluetooth_input_client.h"
 #include "chromeos/dbus/bluetooth_profile_manager_client.h"
 #include "chromeos/dbus/cras_audio_client.h"
-#include "chromeos/dbus/cras_audio_client_stub_impl.h"
 #include "chromeos/dbus/cros_disks_client.h"
 #include "chromeos/dbus/cryptohome_client.h"
 #include "chromeos/dbus/debug_daemon_client.h"
@@ -32,6 +31,7 @@
 #include "chromeos/dbus/fake_bluetooth_gatt_service_client.h"
 #include "chromeos/dbus/fake_bluetooth_input_client.h"
 #include "chromeos/dbus/fake_bluetooth_profile_manager_client.h"
+#include "chromeos/dbus/fake_cras_audio_client.h"
 #include "chromeos/dbus/fake_cryptohome_client.h"
 #include "chromeos/dbus/fake_debug_daemon_client.h"
 #include "chromeos/dbus/fake_easy_unlock_client.h"
@@ -155,7 +155,7 @@ DBusClientBundle::DBusClientBundle(DBusClientTypeMask unstub_client_mask)
   if (!IsUsingStub(CRAS))
     cras_audio_client_.reset(CrasAudioClient::Create());
   else
-    cras_audio_client_.reset(new CrasAudioClientStubImpl);
+    cras_audio_client_.reset(new FakeCrasAudioClient);
 
   cros_disks_client_.reset(CrosDisksClient::Create(
       IsUsingStub(CROS_DISKS) ? STUB_DBUS_CLIENT_IMPLEMENTATION

chromeos/dbus/cras_audio_client_stub_impl.cc → chromeos/dbus/fake_cras_audio_client.cc

@@ -2,20 +2,20 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chromeos/dbus/cras_audio_client_stub_impl.h"
+#include "chromeos/dbus/fake_cras_audio_client.h"
 
 namespace chromeos {
 
-CrasAudioClientStubImpl::CrasAudioClientStubImpl()
+FakeCrasAudioClient::FakeCrasAudioClient()
     : active_input_node_id_(0),
       active_output_node_id_(0) {
 }
 
-CrasAudioClientStubImpl::~CrasAudioClientStubImpl() {
+FakeCrasAudioClient::~FakeCrasAudioClient() {
 }
 
-void CrasAudioClientStubImpl::Init(dbus::Bus* bus) {
-  VLOG(1) << "CrasAudioClientStubImpl is created";
+void FakeCrasAudioClient::Init(dbus::Bus* bus) {
+  VLOG(1) << "FakeCrasAudioClient is created";
 
   // Fake audio output nodes.
   AudioNode node_1;
@@ -60,51 +60,51 @@ void CrasAudioClientStubImpl::Init(dbus::Bus* bus) {
   node_list_.push_back(node_5);
 }
 
-void CrasAudioClientStubImpl::AddObserver(Observer* observer) {
+void FakeCrasAudioClient::AddObserver(Observer* observer) {
   observers_.AddObserver(observer);
 }
 
-void CrasAudioClientStubImpl::RemoveObserver(Observer* observer) {
+void FakeCrasAudioClient::RemoveObserver(Observer* observer) {
   observers_.RemoveObserver(observer);
 }
 
-bool CrasAudioClientStubImpl::HasObserver(Observer* observer) {
+bool FakeCrasAudioClient::HasObserver(Observer* observer) {
   return observers_.HasObserver(observer);
 }
 
-void CrasAudioClientStubImpl::GetVolumeState(
+void FakeCrasAudioClient::GetVolumeState(
     const GetVolumeStateCallback& callback) {
   callback.Run(volume_state_, true);
 }
 
-void CrasAudioClientStubImpl::GetNodes(const GetNodesCallback& callback,
-                                       const ErrorCallback& error_callback) {
+void FakeCrasAudioClient::GetNodes(const GetNodesCallback& callback,
+                                   const ErrorCallback& error_callback) {
   callback.Run(node_list_, true);
 }
 
-void CrasAudioClientStubImpl::SetOutputNodeVolume(uint64 node_id,
-                                                  int32 volume) {
+void FakeCrasAudioClient::SetOutputNodeVolume(uint64 node_id,
+                                              int32 volume) {
 }
 
-void CrasAudioClientStubImpl::SetOutputUserMute(bool mute_on) {
+void FakeCrasAudioClient::SetOutputUserMute(bool mute_on) {
   volume_state_.output_user_mute = mute_on;
   FOR_EACH_OBSERVER(Observer,
                     observers_,
                     OutputMuteChanged(volume_state_.output_user_mute));
 }
 
-void CrasAudioClientStubImpl::SetInputNodeGain(uint64 node_id,
-                                               int32 input_gain) {
+void FakeCrasAudioClient::SetInputNodeGain(uint64 node_id,
+                                           int32 input_gain) {
 }
 
-void CrasAudioClientStubImpl::SetInputMute(bool mute_on) {
+void FakeCrasAudioClient::SetInputMute(bool mute_on) {
   volume_state_.input_mute = mute_on;
   FOR_EACH_OBSERVER(Observer,
                     observers_,
                     InputMuteChanged(volume_state_.input_mute));
 }
 
-void CrasAudioClientStubImpl::SetActiveOutputNode(uint64 node_id) {
+void FakeCrasAudioClient::SetActiveOutputNode(uint64 node_id) {
   if (active_output_node_id_ == node_id)
     return;
 
@@ -120,7 +120,7 @@ void CrasAudioClientStubImpl::SetActiveOutputNode(uint64 node_id) {
                     ActiveOutputNodeChanged(node_id));
 }
 
-void CrasAudioClientStubImpl::SetActiveInputNode(uint64 node_id) {
+void FakeCrasAudioClient::SetActiveInputNode(uint64 node_id) {
   if (active_input_node_id_ == node_id)
     return;
 
@@ -136,43 +136,43 @@ void CrasAudioClientStubImpl::SetActiveInputNode(uint64 node_id) {
                     ActiveInputNodeChanged(node_id));
 }
 
-void CrasAudioClientStubImpl::AddActiveInputNode(uint64 node_id) {
+void FakeCrasAudioClient::AddActiveInputNode(uint64 node_id) {
   for (size_t i = 0; i < node_list_.size(); ++i) {
     if (node_list_[i].id == node_id)
       node_list_[i].active = true;
   }
 }
 
-void CrasAudioClientStubImpl::RemoveActiveInputNode(uint64 node_id) {
+void FakeCrasAudioClient::RemoveActiveInputNode(uint64 node_id) {
   for (size_t i = 0; i < node_list_.size(); ++i) {
     if (node_list_[i].id == node_id)
       node_list_[i].active = false;
   }
 }
 
-void CrasAudioClientStubImpl::SwapLeftRight(uint64 node_id, bool swap) {
+void FakeCrasAudioClient::SwapLeftRight(uint64 node_id, bool swap) {
 }
 
-void CrasAudioClientStubImpl::AddActiveOutputNode(uint64 node_id) {
+void FakeCrasAudioClient::AddActiveOutputNode(uint64 node_id) {
   for (size_t i = 0; i < node_list_.size(); ++i) {
     if (node_list_[i].id == node_id)
       node_list_[i].active = true;
   }
 }
 
-void CrasAudioClientStubImpl::RemoveActiveOutputNode(uint64 node_id) {
+void FakeCrasAudioClient::RemoveActiveOutputNode(uint64 node_id) {
   for (size_t i = 0; i < node_list_.size(); ++i) {
     if (node_list_[i].id == node_id)
       node_list_[i].active = false;
   }
 }
 
-void CrasAudioClientStubImpl::SetAudioNodesForTesting(
+void FakeCrasAudioClient::SetAudioNodesForTesting(
     const AudioNodeList& audio_nodes) {
   node_list_ = audio_nodes;
 }
 
-void CrasAudioClientStubImpl::SetAudioNodesAndNotifyObserversForTesting(
+void FakeCrasAudioClient::SetAudioNodesAndNotifyObserversForTesting(
     const AudioNodeList& new_nodes) {
   SetAudioNodesForTesting(new_nodes);
   FOR_EACH_OBSERVER(Observer, observers_, NodesChanged());

chromeos/dbus/cras_audio_client_stub_impl.h → chromeos/dbus/fake_cras_audio_client.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_CRAS_AUDIO_CLIENT_STUB_IMPL_H_
-#define CHROMEOS_DBUS_CRAS_AUDIO_CLIENT_STUB_IMPL_H_
+#ifndef CHROMEOS_DBUS_FAKE_CRAS_AUDIO_CLIENT_H_
+#define CHROMEOS_DBUS_FAKE_CRAS_AUDIO_CLIENT_H_
 
 #include "chromeos/chromeos_export.h"
 #include "chromeos/dbus/cras_audio_client.h"
@@ -13,10 +13,10 @@ namespace chromeos {
 class CrasAudioHandlerTest;
 
 // The CrasAudioClient implementation used on Linux desktop.
-class CHROMEOS_EXPORT CrasAudioClientStubImpl : public CrasAudioClient {
+class CHROMEOS_EXPORT FakeCrasAudioClient : public CrasAudioClient {
  public:
-  CrasAudioClientStubImpl();
-  virtual ~CrasAudioClientStubImpl();
+  FakeCrasAudioClient();
+  virtual ~FakeCrasAudioClient();
 
   // CrasAudioClient overrides:
   virtual void Init(dbus::Bus* bus) override;
@@ -52,9 +52,9 @@ class CHROMEOS_EXPORT CrasAudioClientStubImpl : public CrasAudioClient {
   uint64 active_output_node_id_;
   ObserverList<Observer> observers_;
 
-  DISALLOW_COPY_AND_ASSIGN(CrasAudioClientStubImpl);
+  DISALLOW_COPY_AND_ASSIGN(FakeCrasAudioClient);
 };
 
 }  // namespace chromeos
 
-#endif  // CHROMEOS_DBUS_CRAS_AUDIO_CLIENT_STUB_IMPL_H_
+#endif  // CHROMEOS_DBUS_FAKE_CRAS_AUDIO_CLIENT_H_

extensions/shell/browser/shell_audio_controller_chromeos_unittest.cc

@@ -8,8 +8,8 @@
 #include "chromeos/audio/audio_device.h"
 #include "chromeos/audio/cras_audio_handler.h"
 #include "chromeos/dbus/audio_node.h"
-#include "chromeos/dbus/cras_audio_client_stub_impl.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
+#include "chromeos/dbus/fake_cras_audio_client.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using chromeos::AudioDevice;
@@ -25,7 +25,7 @@ class ShellAudioControllerTest : public testing::Test {
     scoped_ptr<chromeos::DBusThreadManagerSetter> dbus_setter =
         chromeos::DBusThreadManager::GetSetterForTesting();
 
-    audio_client_ = new chromeos::CrasAudioClientStubImpl();
+    audio_client_ = new chromeos::FakeCrasAudioClient();
     audio_client_->SetAudioNodesForTesting(AudioNodeList());
     dbus_setter->SetCrasAudioClient(make_scoped_ptr(audio_client_));
 
@@ -67,7 +67,7 @@ class ShellAudioControllerTest : public testing::Test {
     ASSERT_TRUE(false) << "Didn't find ID " << id;
   }
 
-  chromeos::CrasAudioClientStubImpl* audio_client_;  // Not owned.
+  chromeos::FakeCrasAudioClient* audio_client_;  // Not owned.
   chromeos::CrasAudioHandler* audio_handler_;  // Not owned.
   scoped_ptr<ShellAudioController> controller_;