cros: Enable new cras audio handler by default

chromeos/audio/cras_audio_handler.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chromeos/audio/cras_audio_handler.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/logging.h"
 #include "chromeos/audio/audio_pref_handler.h"
+#include "chromeos/audio/mock_cras_audio_handler.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 
 using std::max;
 using std::min;
 
 namespace chromeos {
 
 namespace {
 
 // Default value for unmuting, as a percent in the range [0, 100].
@@ skipping 32 matching lines @@
 }
 
 // static
 void CrasAudioHandler::Initialize(
     scoped_refptr<AudioPrefHandler> audio_pref_handler) {
   CHECK(!g_cras_audio_handler);
   g_cras_audio_handler = new CrasAudioHandler(audio_pref_handler);
 }
 
 // static
+void CrasAudioHandler::InitializeForTesting() {
+  CHECK(!g_cras_audio_handler);
+  g_cras_audio_handler = new MockCrasAudioHandler();
+}
+
+// static
 void CrasAudioHandler::Shutdown() {
   CHECK(g_cras_audio_handler);
   delete g_cras_audio_handler;
   g_cras_audio_handler = NULL;
 }
 
 // static
 bool CrasAudioHandler::IsInitialized() {
   return g_cras_audio_handler != NULL;
 }
@@ skipping 108 matching lines @@
       weak_ptr_factory_(this),
       output_mute_on_(false),
       input_mute_on_(false),
       output_volume_(0),
       active_output_node_id_(0),
       active_input_node_id_(0),
       has_alternative_input_(false),
       has_alternative_output_(false),
       output_mute_locked_(false),
       input_mute_locked_(false) {
+  if (!audio_pref_handler)
+    return;
+  // If the DBusThreadManager or the CrasAudioClient aren't available, there
+  // isn't much we can do. This should only happen when running tests.
+  if (!chromeos::DBusThreadManager::IsInitialized() ||
+      !chromeos::DBusThreadManager::Get() ||
+      !chromeos::DBusThreadManager::Get()->GetCrasAudioClient())
+    return;
   chromeos::DBusThreadManager::Get()->GetCrasAudioClient()->AddObserver(this);
-  DCHECK(audio_pref_handler_.get());
   audio_pref_handler_->AddAudioPrefObserver(this);
   SetupInitialAudioState();
 }
 
 CrasAudioHandler::~CrasAudioHandler() {
+  if (!chromeos::DBusThreadManager::IsInitialized() ||

[James Cook, 2013/04/30 23:31:21]

Do you need to check audio_pref_handler_ here?

[rkc, 2013/04/30 23:36:37]

Yeah; in case we're running in a test, we also need to make sure we don't try to
"remove" an observer either - with the MockDBusThreadManager, GetCrasAudioClient
is NULL and at certain tests the DBusThreadManager can be NULL too.

+      !chromeos::DBusThreadManager::Get() ||
+      !chromeos::DBusThreadManager::Get()->GetCrasAudioClient())
+    return;
   chromeos::DBusThreadManager::Get()->GetCrasAudioClient()->
       RemoveObserver(this);
   audio_pref_handler_->RemoveAudioPrefObserver(this);
   audio_pref_handler_ = NULL;
 }
 
 void CrasAudioHandler::AudioClientRestarted() {
   SetupInitialAudioState();
 }
 
@@ skipping 118 matching lines @@
                !device.is_input &&
                device.type != AUDIO_TYPE_INTERNAL_SPEAKER) {
       has_alternative_output_ = true;
     }
   }
 
   FOR_EACH_OBSERVER(AudioObserver, observers_, OnAudioNodesChanged());
 }
 
 }  // namespace chromeos