Move ChannelLayout into media namespace.

content/renderer/renderer_webkitplatformsupport_impl.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/renderer/renderer_webkitplatformsupport_impl.h"
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/metrics/histogram.h"
@@ skipping 552 matching lines @@
 size_t RendererWebKitPlatformSupportImpl::audioHardwareBufferSize() {
   return audio_hardware::GetOutputBufferSize();
 }
 
 WebAudioDevice*
 RendererWebKitPlatformSupportImpl::createAudioDevice(
     size_t bufferSize,
     unsigned numberOfChannels,
     double sampleRate,
     WebAudioDevice::RenderCallback* callback) {
-  ChannelLayout layout = CHANNEL_LAYOUT_UNSUPPORTED;
+  media::ChannelLayout layout = media::CHANNEL_LAYOUT_UNSUPPORTED;
 
   // The |numberOfChannels| does not exactly identify the channel layout of the
   // device. The switch statement below assigns a best guess to the channel
   // layout based on number of channels.
   // TODO(crogers): WebKit should give the channel layout instead of the hard
   // channel count.
   switch (numberOfChannels) {
     case 1:
-      layout = CHANNEL_LAYOUT_MONO;
+      layout = media::CHANNEL_LAYOUT_MONO;
       break;
     case 2:
-      layout = CHANNEL_LAYOUT_STEREO;
+      layout = media::CHANNEL_LAYOUT_STEREO;
       break;
     case 3:
-      layout = CHANNEL_LAYOUT_2_1;
+      layout = media::CHANNEL_LAYOUT_2_1;
       break;
     case 4:
-      layout = CHANNEL_LAYOUT_4_0;
+      layout = media::CHANNEL_LAYOUT_4_0;
       break;
     case 5:
-      layout = CHANNEL_LAYOUT_5_0;
+      layout = media::CHANNEL_LAYOUT_5_0;
       break;
     case 6:
-      layout = CHANNEL_LAYOUT_5_1;
+      layout = media::CHANNEL_LAYOUT_5_1;
       break;
     case 7:
-      layout = CHANNEL_LAYOUT_7_0;
+      layout = media::CHANNEL_LAYOUT_7_0;
       break;
     case 8:
-      layout = CHANNEL_LAYOUT_7_1;
+      layout = media::CHANNEL_LAYOUT_7_1;
       break;
     default:
-      layout = CHANNEL_LAYOUT_STEREO;
+      layout = media::CHANNEL_LAYOUT_STEREO;
   }
 
   media::AudioParameters params(
       media::AudioParameters::AUDIO_PCM_LOW_LATENCY, layout,
       static_cast<int>(sampleRate), 16, bufferSize);
 
   return new RendererWebAudioDeviceImpl(params, callback);
 }
 
 //------------------------------------------------------------------------------
@@ skipping 136 matching lines @@
     const char16* characters,
     size_t length,
     size_t before_index,
     const WebKit::WebString& locale) {
   // Crash if WebKit calls this function when canHyphenate returns false.
   DCHECK(locale.isEmpty() || locale.equals("en-US"));
   DCHECK(hyphenator_.get());
   return hyphenator_->ComputeLastHyphenLocation(string16(characters, length),
                                                 before_index);
 }