Move ChannelLayout into media namespace.

content/test/webrtc_audio_device_test.h

 // 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.
 
 #ifndef CONTENT_TEST_WEBRTC_AUDIO_DEVICE_TEST_H_
 #define CONTENT_TEST_WEBRTC_AUDIO_DEVICE_TEST_H_
 
 #include <string>
 
 #include "base/file_path.h"
@@ skipping 98 matching lines @@
 };
 
 // Individual tests can provide an implementation (or mock) of this interface
 // when the audio code queries for hardware capabilities on the IO thread.
 class AudioUtilInterface {
  public:
   virtual ~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;
 };
 
 // Implemented and defined in the cc file.
 class ReplaceContentClientRenderer;
 
 class WebRTCAudioDeviceTest : public ::testing::Test, public IPC::Listener {
  public:
   WebRTCAudioDeviceTest();
   virtual ~WebRTCAudioDeviceTest();
 
   virtual void SetUp() OVERRIDE;
   virtual void TearDown() OVERRIDE;
 
   // Sends an IPC message to the IO thread channel.
   bool Send(IPC::Message* message);
 
   void SetAudioUtilCallback(AudioUtilInterface* callback);
 
  protected:
   void InitializeIOThread(const char* thread_name);
   void UninitializeIOThread();
   void CreateChannel(const char* name);
   void DestroyChannel();
 
   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;
 
   // Posts a final task to the IO message loop and waits for completion.
   void WaitForIOThreadCompletion();
   void WaitForAudioManagerCompletion();
   void WaitForMessageLoopCompletion(base::MessageLoopProxy* loop);
 
   // Convenience getter for gmock.
@@ skipping 47 matching lines @@
   virtual ~WebRTCTransportImpl();
 
   virtual int SendPacket(int channel, const void* data, int len) OVERRIDE;
   virtual int SendRTCPPacket(int channel, const void* data, int len) OVERRIDE;
 
  private:
   webrtc::VoENetwork* network_;
 };
 
 #endif  // CONTENT_TEST_WEBRTC_AUDIO_DEVICE_TEST_H_