Refactor the Get*Hardware* routines a bit.

content/renderer/media/webrtc_audio_device_unittest.cc

Index: content/renderer/media/webrtc_audio_device_unittest.cc
===================================================================
--- content/renderer/media/webrtc_audio_device_unittest.cc	(revision 110480)
+++ content/renderer/media/webrtc_audio_device_unittest.cc	(working copy)
@@ -6,6 +6,7 @@
 #include "base/test/test_timeouts.h"
 #include "content/renderer/media/webrtc_audio_device_impl.h"
 #include "content/test/webrtc_audio_device_test.h"
+#include "media/audio/audio_manager.h"
 #include "media/audio/audio_util.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "third_party/webrtc/voice_engine/main/interface/voe_audio_processing.h"
@@ -15,6 +16,7 @@
 #include "third_party/webrtc/voice_engine/main/interface/voe_network.h"
 
 using testing::_;
+using testing::AnyNumber;
 using testing::InvokeWithoutArgs;
 using testing::Return;
 using testing::StrEq;
@@ -117,7 +119,7 @@
 // WebRtcAudioDeviceImpl.
 TEST_F(WebRTCAudioDeviceTest, Construct) {
   AudioUtilNoHardware audio_util(48000.0, 48000.0);
-  set_audio_util_callback(&audio_util);
+  SetAudioUtilCallback(&audio_util);
   scoped_refptr<WebRtcAudioDeviceImpl> audio_device(
       new WebRtcAudioDeviceImpl());
   audio_device->SetSessionId(1);
@@ -142,7 +144,7 @@
     return;
 
   AudioUtil audio_util;
-  set_audio_util_callback(&audio_util);
+  SetAudioUtilCallback(&audio_util);
 
   EXPECT_CALL(media_observer(),
       OnSetAudioStreamStatus(_, 1, StrEq("created"))).Times(1);
@@ -151,7 +153,7 @@
   EXPECT_CALL(media_observer(),
       OnSetAudioStreamStatus(_, 1, StrEq("closed"))).Times(1);
   EXPECT_CALL(media_observer(),
-      OnDeleteAudioStream(_, 1)).Times(1);
+      OnDeleteAudioStream(_, 1)).Times(AnyNumber());
 
   scoped_refptr<WebRtcAudioDeviceImpl> audio_device(
       new WebRtcAudioDeviceImpl());
@@ -211,7 +213,7 @@
     return;
 
   AudioUtil audio_util;
-  set_audio_util_callback(&audio_util);
+  SetAudioUtilCallback(&audio_util);
 
   // TODO(tommi): extend MediaObserver and MockMediaObserver with support
   // for new interfaces, like OnSetAudioStreamRecording(). When done, add
@@ -278,7 +280,7 @@
       GetTestDataPath(FILE_PATH_LITERAL("speechmusic_mono_16kHz.pcm")));
 
   AudioUtil audio_util;
-  set_audio_util_callback(&audio_util);
+  SetAudioUtilCallback(&audio_util);
 
   EXPECT_CALL(media_observer(),
       OnSetAudioStreamStatus(_, 1, StrEq("created"))).Times(1);
@@ -334,8 +336,15 @@
   if (IsRunningHeadless())
     return;
 
+  EXPECT_CALL(media_observer(),
+      OnSetAudioStreamStatus(_, 1, StrEq("created")));
+  EXPECT_CALL(media_observer(),
+      OnSetAudioStreamPlaying(_, 1, true));
+  EXPECT_CALL(media_observer(),
+      OnSetAudioStreamStatus(_, 1, StrEq("closed")));
+
   AudioUtil audio_util;
-  set_audio_util_callback(&audio_util);
+  SetAudioUtilCallback(&audio_util);
 
   scoped_refptr<WebRtcAudioDeviceImpl> audio_device(
       new WebRtcAudioDeviceImpl());