Move media/audio files into media namespace

media/audio/audio_output_proxy_unittest.cc

Index: media/audio/audio_output_proxy_unittest.cc
diff --git a/media/audio/audio_output_proxy_unittest.cc b/media/audio/audio_output_proxy_unittest.cc
index 1f955b63998946c5e9f6069713588318d2ecf4e2..b4ebea83e3b45db9e0d751c42224679684bf26c9 100644
--- a/media/audio/audio_output_proxy_unittest.cc
+++ b/media/audio/audio_output_proxy_unittest.cc
@@ -15,6 +15,19 @@ using ::testing::_;
 using ::testing::Mock;
 using ::testing::Return;
 
+// XXX(vrk): This unit test runs into GTest asserts when I try to put it in

[vrk (LEFT CHROMIUM), 2012/03/21 00:45:46]

Wanted to highlight this weirdness. I have no idea what's going on with this
test :/ any ideas?

[scherkus (not reviewing), 2012/03/21 08:50:27]

it's possible that we're running into duplicate definitions of mock classes
(i.e., one inside of media namespace, one outside of namespace) -- for example I
notice many different definitions of MockAudioManager

try moving the mock classes below into an anon namespace

[vrk (LEFT CHROMIUM), 2012/03/21 20:17:48]

Yay that works, and seems like the right thing to do anyway to avoid name
collisions in unit tests in the future! Thanks!

...but still a bit confused about why there was a problem originally!

The other definitions of "MockAudioManager" are in
media/audio/audio_low_latency_input_output_unittest.cc and
/content/browser/speech/speech_recognizer_impl_unittest.cc. Only the first is
linked into media_unittests, and both of these definitions are in unnamed
namespaces regardless. Doesn't that mean they're unique/private to the
translation unit? So how could there be a problem, I guess gmock is doing
something funky with these classes in the macro expansion?

[scherkus (not reviewing), 2012/03/22 09:43:21]

Actually it looks like it wasn't MockAudioManager but perhaps
MockAudioSourceCallback! None of them appear to be in anon namespaces.

Want to see if it's possible to de-dupe the various mocks in a follow up CL? I'm
not sure how much the duplicate definitions diverge.

+// the media namespace. I have no idea why. It complains in particular about
+// the EXPECT_CALL in SetUp() and, after that's commented out, it crashes
+// at EXPECT_CALL for the MakeAudioOutputStream in OpenAndClose.
+
+using media::AudioBuffersState;
+using media::AudioInputStream;
+using media::AudioOutputDispatcher;
+using media::AudioOutputStream;
+using media::AudioOutputProxy;
+using media::AudioManager;
+using media::AudioParameters;
+
 static const int kTestCloseDelayMs = 100;
 
 // Used in the test where we don't want a stream to be closed unexpectedly.