First step towards moving AudioDevice from content/ to media/audio.

content/renderer/media/audio_message_filter_unittest.cc

Index: content/renderer/media/audio_message_filter_unittest.cc
diff --git a/content/renderer/media/audio_message_filter_unittest.cc b/content/renderer/media/audio_message_filter_unittest.cc
index 203121307720b0f1e1cf817d3f96fad7d37111a5..b095690c13c92a2c3ab6dad430901893519c8b16 100644
--- a/content/renderer/media/audio_message_filter_unittest.cc
+++ b/content/renderer/media/audio_message_filter_unittest.cc
@@ -5,17 +5,18 @@
 #include "base/message_loop.h"
 #include "content/common/media/audio_messages.h"
 #include "content/renderer/media/audio_message_filter.h"
+#include "media/audio/audio_device_ipc.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
-class MockAudioDelegate : public AudioMessageFilter::Delegate {
+class MockAudioDelegate : public media::AudioDeviceIPCDelegate {
  public:
   MockAudioDelegate() {
     Reset();
   }
 
-  virtual void OnStateChanged(AudioStreamState state) {
+  virtual void OnStateChanged(media::AudioStreamState state) {
     state_changed_received_ = true;
     state_ = state;
   }
@@ -35,7 +36,7 @@ class MockAudioDelegate : public AudioMessageFilter::Delegate {
 
   void Reset() {
     state_changed_received_ = false;
-    state_ = kAudioStreamError;
+    state_ = media::kAudioStreamError;
 
     created_received_ = false;
     handle_ = base::SharedMemory::NULLHandle();
@@ -46,7 +47,7 @@ class MockAudioDelegate : public AudioMessageFilter::Delegate {
   }
 
   bool state_changed_received() { return state_changed_received_; }
-  AudioStreamState state() { return state_; }
+  media::AudioStreamState state() { return state_; }
 
   bool created_received() { return created_received_; }
   base::SharedMemoryHandle handle() { return handle_; }
@@ -57,7 +58,7 @@ class MockAudioDelegate : public AudioMessageFilter::Delegate {
 
  private:
   bool state_changed_received_;
-  AudioStreamState state_;
+  media::AudioStreamState state_;
 
   bool created_received_;
   base::SharedMemoryHandle handle_;
@@ -99,9 +100,9 @@ TEST(AudioMessageFilterTest, Basic) {
   // AudioMsg_NotifyStreamStateChanged
   EXPECT_FALSE(delegate.state_changed_received());
   filter->OnMessageReceived(
-      AudioMsg_NotifyStreamStateChanged(stream_id, kAudioStreamPlaying));
+      AudioMsg_NotifyStreamStateChanged(stream_id, media::kAudioStreamPlaying));
   EXPECT_TRUE(delegate.state_changed_received());
-  EXPECT_TRUE(kAudioStreamPlaying == delegate.state());
+  EXPECT_TRUE(media::kAudioStreamPlaying == delegate.state());
   delegate.Reset();
 
   message_loop.RunAllPending();
@@ -122,7 +123,8 @@ TEST(AudioMessageFilterTest, Delegates) {
   EXPECT_FALSE(delegate1.state_changed_received());
   EXPECT_FALSE(delegate2.state_changed_received());
   filter->OnMessageReceived(
-      AudioMsg_NotifyStreamStateChanged(stream_id1, kAudioStreamPlaying));
+      AudioMsg_NotifyStreamStateChanged(stream_id1,

[scherkus (not reviewing), 2012/07/23 22:57:51]

mixed indent: drop stream_id1 to next line

[tommi (sloooow) - chröme, 2012/07/24 09:49:44]

Done.

+          media::kAudioStreamPlaying));
   EXPECT_TRUE(delegate1.state_changed_received());
   EXPECT_FALSE(delegate2.state_changed_received());
   delegate1.Reset();
@@ -130,7 +132,8 @@ TEST(AudioMessageFilterTest, Delegates) {
   EXPECT_FALSE(delegate1.state_changed_received());
   EXPECT_FALSE(delegate2.state_changed_received());
   filter->OnMessageReceived(
-      AudioMsg_NotifyStreamStateChanged(stream_id2, kAudioStreamPlaying));
+      AudioMsg_NotifyStreamStateChanged(stream_id2,

[scherkus (not reviewing), 2012/07/23 22:57:51]

mixed indent: drop stream_id1 to next line

[tommi (sloooow) - chröme, 2012/07/24 09:49:44]

Done.

+          media::kAudioStreamPlaying));
   EXPECT_FALSE(delegate1.state_changed_received());
   EXPECT_TRUE(delegate2.state_changed_received());
   delegate2.Reset();
@@ -139,13 +142,15 @@ TEST(AudioMessageFilterTest, Delegates) {
   filter->RemoveDelegate(stream_id1);
   EXPECT_FALSE(delegate1.state_changed_received());
   filter->OnMessageReceived(
-      AudioMsg_NotifyStreamStateChanged(stream_id1, kAudioStreamPlaying));
+      AudioMsg_NotifyStreamStateChanged(stream_id1,

[scherkus (not reviewing), 2012/07/23 22:57:51]

mixed indent: drop stream_id1 to next line

[tommi (sloooow) - chröme, 2012/07/24 09:49:44]

Done.

+          media::kAudioStreamPlaying));
   EXPECT_FALSE(delegate1.state_changed_received());
 
   filter->RemoveDelegate(stream_id2);
   EXPECT_FALSE(delegate2.state_changed_received());
   filter->OnMessageReceived(
-      AudioMsg_NotifyStreamStateChanged(stream_id2, kAudioStreamPlaying));
+      AudioMsg_NotifyStreamStateChanged(stream_id2,

[scherkus (not reviewing), 2012/07/23 22:57:51]

mixed indent: drop stream_id1 to next line

[tommi (sloooow) - chröme, 2012/07/24 09:49:44]

Done.

+          media::kAudioStreamPlaying));
   EXPECT_FALSE(delegate2.state_changed_received());
 
   message_loop.RunAllPending();