summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjennyz@chromium.org <jennyz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-08 18:40:21 +0000
committerjennyz@chromium.org <jennyz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-08 18:40:21 +0000
commit91f59b60976dc4b4c4f6308ade9683af348438a7 (patch)
treee9d3d7dead9a598dc69e625b26ca7cc49800b8f7
parent27909fa8cd4b89c8fff94348771d0ec56e4ca374 (diff)
downloadchromium_src-91f59b60976dc4b4c4f6308ade9683af348438a7.zip
chromium_src-91f59b60976dc4b4c4f6308ade9683af348438a7.tar.gz
chromium_src-91f59b60976dc4b4c4f6308ade9683af348438a7.tar.bz2
All cras nodes should be inintialized as non-active in the stub implementation. This fixes the cras warning log issue when running ash_unittests.
BUG=298367 Review URL: https://codereview.chromium.org/26358005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@227553 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chromeos/dbus/cras_audio_client_stub_impl.cc8
1 files changed, 0 insertions, 8 deletions
diff --git a/chromeos/dbus/cras_audio_client_stub_impl.cc b/chromeos/dbus/cras_audio_client_stub_impl.cc
index c902ab8..934614f 100644
--- a/chromeos/dbus/cras_audio_client_stub_impl.cc
+++ b/chromeos/dbus/cras_audio_client_stub_impl.cc
@@ -18,7 +18,6 @@ void CrasAudioClientStubImpl::Init(dbus::Bus* bus) {
node_1.device_name = "Fake Speaker";
node_1.type = "INTERNAL_SPEAKER";
node_1.name = "Speaker";
- node_1.active = false;
node_list_.push_back(node_1);
AudioNode node_2;
@@ -27,9 +26,7 @@ void CrasAudioClientStubImpl::Init(dbus::Bus* bus) {
node_2.device_name = "Fake Headphone";
node_2.type = "HEADPHONE";
node_2.name = "Headphone";
- node_2.active = false;
node_list_.push_back(node_2);
- active_output_node_id_ = node_2.id;
AudioNode node_3;
node_3.is_input = false;
@@ -37,7 +34,6 @@ void CrasAudioClientStubImpl::Init(dbus::Bus* bus) {
node_3.device_name = "Fake Bluetooth Headphone";
node_3.type = "BLUETOOTH";
node_3.name = "Headphone";
- node_3.active = false;
node_list_.push_back(node_3);
// Fake audio input ndoes
@@ -47,7 +43,6 @@ void CrasAudioClientStubImpl::Init(dbus::Bus* bus) {
node_4.device_name = "Fake Internal Mic";
node_4.type = "INTERNAL_MIC";
node_4.name = "Internal Mic";
- node_4.active = false;
node_list_.push_back(node_4);
AudioNode node_5;
@@ -56,10 +51,7 @@ void CrasAudioClientStubImpl::Init(dbus::Bus* bus) {
node_5.device_name = "Fake USB Mic";
node_5.type = "USB";
node_5.name = "Mic";
- node_5.active = true;
node_list_.push_back(node_5);
-
- active_input_node_id_ = node_5.id;
}
CrasAudioClientStubImpl::~CrasAudioClientStubImpl() {