Move ChannelLayout into media namespace.

Also moves kChannelOrderings extern into a function for export compatibility
with MSVC++ and the shared_memory_support target.

BUG=none
TEST=compiles.

Review URL: https://codereview.chromium.org/11198018

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162502 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 5 insertions, 5 deletions

diff --git a/content/test/webrtc_audio_device_test.cc b/content/test/webrtc_audio_device_test.cc
index 777f7d4..685f81d4 100644
--- a/content/test/webrtc_audio_device_test.cc
+++ b/content/test/webrtc_audio_device_test.cc
@@ -274,11 +274,11 @@ void WebRTCAudioDeviceTest::OnGetHardwareInputSampleRate(int* sample_rate) {
 }
 
 void WebRTCAudioDeviceTest::OnGetHardwareInputChannelLayout(
-    ChannelLayout* layout) {
+    media::ChannelLayout* layout) {
   EXPECT_TRUE(audio_util_callback_);
-  *layout = audio_util_callback_ ?
+  *layout = !audio_util_callback_ ? media::CHANNEL_LAYOUT_NONE :
       audio_util_callback_->GetAudioInputHardwareChannelLayout(
-          media::AudioManagerBase::kDefaultDeviceId) : CHANNEL_LAYOUT_NONE;
+          media::AudioManagerBase::kDefaultDeviceId);
 }
 
 // IPC::Listener implementation.
diff --git a/content/test/webrtc_audio_device_test.h b/content/test/webrtc_audio_device_test.h
index e2a0429..0525c06 100644
--- a/content/test/webrtc_audio_device_test.h
+++ b/content/test/webrtc_audio_device_test.h
@@ -116,7 +116,7 @@ class AudioUtilInterface {
   virtual int GetAudioHardwareSampleRate() = 0;
   virtual int GetAudioInputHardwareSampleRate(
       const std::string& device_id) = 0;
-  virtual ChannelLayout GetAudioInputHardwareChannelLayout(
+  virtual media::ChannelLayout GetAudioInputHardwareChannelLayout(
       const std::string& device_id) = 0;
 };
 
@@ -144,7 +144,7 @@ class WebRTCAudioDeviceTest : public ::testing::Test, public IPC::Listener {
 
   void OnGetHardwareSampleRate(int* sample_rate);
   void OnGetHardwareInputSampleRate(int* sample_rate);
-  void OnGetHardwareInputChannelLayout(ChannelLayout* channels);
+  void OnGetHardwareInputChannelLayout(media::ChannelLayout* channels);
 
   // IPC::Listener implementation.
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;