Move webkit/renderer/media/android/ to content/renderer/media/android/.

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/files/file_path.h"
 #include "base/lazy_instance.h"
 #include "base/metrics/histogram.h"
@@ skipping 66 matching lines @@
 #include "base/synchronization/lock.h"
 #include "content/common/child_process_sandbox_support_impl_linux.h"
 #include "third_party/WebKit/public/platform/linux/WebFontFamily.h"
 #include "third_party/WebKit/public/platform/linux/WebSandboxSupport.h"
 #endif
 
 #if defined(OS_POSIX)
 #include "base/file_descriptor_posix.h"
 #endif
 
+#if defined(OS_ANDROID)
+#include "content/renderer/media/android/audio_decoder_android.h"
+#endif
+
 using WebKit::WebAudioDevice;
 using WebKit::WebBlobRegistry;
 using WebKit::WebFileInfo;
 using WebKit::WebFileSystem;
 using WebKit::WebFrame;
 using WebKit::WebGamepads;
 using WebKit::WebIDBFactory;
 using WebKit::Platform;
 using WebKit::WebMediaStreamCenter;
 using WebKit::WebMediaStreamCenterClient;
@@ skipping 639 matching lines @@
 static void RunWebAudioMediaCodec(base::SharedMemoryHandle encoded_data_handle,
                                   base::FileDescriptor pcm_output,
                                   uint32_t data_size) {
   RenderThread::Get()->Send(new ViewHostMsg_RunWebAudioMediaCodec(
       encoded_data_handle, pcm_output, data_size));
 }
 
 bool RendererWebKitPlatformSupportImpl::loadAudioResource(
     WebKit::WebAudioBus* destination_bus, const char* audio_file_data,
     size_t data_size, double sample_rate) {
-  return webkit_media::DecodeAudioFileData(
-      destination_bus,
-      audio_file_data,
-      data_size,
-      sample_rate,
-      base::Bind(&RunWebAudioMediaCodec));
+  return DecodeAudioFileData(destination_bus,
+                             audio_file_data,
+                             data_size,
+                             sample_rate,
+                             base::Bind(&RunWebAudioMediaCodec));
 }
 #else
 bool RendererWebKitPlatformSupportImpl::loadAudioResource(
     WebKit::WebAudioBus* destination_bus, const char* audio_file_data,
     size_t data_size, double sample_rate) {
   return webkit_media::DecodeAudioFileData(destination_bus,
                                            audio_file_data,
                                            data_size,
                                            sample_rate);
 }
@@ skipping 183 matching lines @@
 
 //------------------------------------------------------------------------------
 
 WebKit::WebString RendererWebKitPlatformSupportImpl::convertIDNToUnicode(
     const WebKit::WebString& host,
     const WebKit::WebString& languages) {
   return net::IDNToUnicode(host.utf8(), languages.utf8());
 }
 
 }  // namespace content