Move ChannelLayout into media namespace.

content/test/webrtc_audio_device_test.cc

 // Copyright (c) 2012 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 "content/test/webrtc_audio_device_test.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/compiler_specific.h"
 #include "base/file_util.h"
@@ skipping 256 matching lines @@
 }
 
 void WebRTCAudioDeviceTest::OnGetHardwareInputSampleRate(int* sample_rate) {
   EXPECT_TRUE(audio_util_callback_);
   *sample_rate = audio_util_callback_ ?
       audio_util_callback_->GetAudioInputHardwareSampleRate(
           media::AudioManagerBase::kDefaultDeviceId) : 0;
 }
 
 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.
 bool WebRTCAudioDeviceTest::OnMessageReceived(const IPC::Message& message) {
   if (render_thread_) {
     IPC::ChannelProxy::MessageFilter* filter =
         render_thread_->audio_input_message_filter();
     if (filter->OnMessageReceived(message))
       return true;
 
@@ skipping 76 matching lines @@
 WebRTCTransportImpl::~WebRTCTransportImpl() {}
 
 int WebRTCTransportImpl::SendPacket(int channel, const void* data, int len) {
   return network_->ReceivedRTPPacket(channel, data, len);
 }
 
 int WebRTCTransportImpl::SendRTCPPacket(int channel, const void* data,
                                         int len) {
   return network_->ReceivedRTCPPacket(channel, data, len);
 }