Move webkit/media/ into webkit/renderer/media

This code is only used in renderer processes, this just moves the files
to reflect that fact in the directory structure so we can verify it
with DEPS.

BUG=237267

Review URL: https://chromiumcodereview.appspot.com/15842010

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

109 files changed, 348 insertions, 342 deletions

diff --git a/DEPS b/DEPS
index 0c6371c..71c6cf3 100644
--- a/DEPS
+++ b/DEPS
@@ -321,7 +321,7 @@ deps = {
   "src/third_party/accessibility-developer-tools":
     Var("chromium_git") + "/external/accessibility-developer-tools.git@ad5df9a5341d38778658c90e4aa241c4ebe4e8aa",
 
-  "src/webkit/media/crypto/ppapi/cdm":
+  "src/webkit/renderer/media/crypto/ppapi/cdm":
     "/trunk/deps/cdm@181763",
 }
 
diff --git a/chrome/renderer/DEPS b/chrome/renderer/DEPS
index cdfd74b..7b2cf63 100644
--- a/chrome/renderer/DEPS
+++ b/chrome/renderer/DEPS
@@ -17,7 +17,6 @@ include_rules = [
   "+webkit/common/fileapi",
   "+webkit/glue",
   "+webkit/glue/plugins",
-  "+webkit/media",
   "+webkit/plugins",
   "+webkit/renderer",
 
diff --git a/chrome/renderer/prerender/prerender_webmediaplayer.cc b/chrome/renderer/prerender/prerender_webmediaplayer.cc
index efbbd43..9913aa1 100644
--- a/chrome/renderer/prerender/prerender_webmediaplayer.cc
+++ b/chrome/renderer/prerender/prerender_webmediaplayer.cc
@@ -7,7 +7,7 @@
 #include "chrome/common/prerender_messages.h"
 #include "content/public/renderer/render_view.h"
 #include "third_party/WebKit/public/platform/WebURL.h"
-#include "webkit/media/webmediaplayer_delegate.h"
+#include "webkit/renderer/media/webmediaplayer_delegate.h"
 
 namespace prerender {
 
diff --git a/chrome/renderer/prerender/prerender_webmediaplayer.h b/chrome/renderer/prerender/prerender_webmediaplayer.h
index dbd184c..991800d 100644
--- a/chrome/renderer/prerender/prerender_webmediaplayer.h
+++ b/chrome/renderer/prerender/prerender_webmediaplayer.h
@@ -8,7 +8,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "content/public/renderer/render_view_observer.h"
-#include "webkit/media/webmediaplayer_impl.h"
+#include "webkit/renderer/media/webmediaplayer_impl.h"
 
 namespace prerender {
 
diff --git a/content/browser/media/DEPS b/content/browser/media/DEPS
new file mode 100644
index 0000000..9c98e87
--- /dev/null
+++ b/content/browser/media/DEPS
@@ -0,0 +1,6 @@
+include_rules = [
+# TODO(ddorwin): encrypted_media_browsertest.cc uses functions from
+# key_systems, but being a browser test it really shouldn't need to
+# reach into renderer code like this.
+  "+webkit/renderer/media/crypto/key_systems.h",
+]
diff --git a/content/browser/media/encrypted_media_browsertest.cc b/content/browser/media/encrypted_media_browsertest.cc
index e2f6848..13f39d5 100644
--- a/content/browser/media/encrypted_media_browsertest.cc
+++ b/content/browser/media/encrypted_media_browsertest.cc
@@ -19,7 +19,7 @@
 #include "content/test/content_browser_test_utils.h"
 #include "googleurl/src/gurl.h"
 #include "media/base/media_switches.h"
-#include "webkit/media/crypto/key_systems.h"
+#include "webkit/renderer/media/crypto/key_systems.h"
 
 #include "widevine_cdm_version.h"  // In SHARED_INTERMEDIATE_DIR.
 
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index 925041c2..ab2c2ac 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -485,13 +485,6 @@
         '../webkit/glue/webcursor_unittest.cc',
         '../webkit/glue/webkit_glue_unittest.cc',
         '../webkit/glue/worker_task_runner_unittest.cc',
-        '../webkit/media/buffered_data_source_unittest.cc',
-        '../webkit/media/buffered_resource_loader_unittest.cc',
-        '../webkit/media/cache_util_unittest.cc',
-        '../webkit/media/crypto/key_systems_unittest.cc',
-        '../webkit/media/test_response_generator.cc',
-        '../webkit/media/test_response_generator.h',
-        '../webkit/media/webaudiosourceprovider_impl_unittest.cc',
         '../webkit/mocks/mock_weburlloader.cc',
         '../webkit/mocks/mock_weburlloader.h',
         '../webkit/common/user_agent/user_agent_unittest.cc',
@@ -520,6 +513,13 @@
         '../webkit/browser/quota/quota_temporary_storage_evictor_unittest.cc',
         '../webkit/browser/quota/usage_tracker_unittest.cc',
         '../webkit/renderer/cpp_variant_unittest.cc',
+        '../webkit/renderer/media/buffered_data_source_unittest.cc',
+        '../webkit/renderer/media/buffered_resource_loader_unittest.cc',
+        '../webkit/renderer/media/cache_util_unittest.cc',
+        '../webkit/renderer/media/crypto/key_systems_unittest.cc',
+        '../webkit/renderer/media/test_response_generator.cc',
+        '../webkit/renderer/media/test_response_generator.h',
+        '../webkit/renderer/media/webaudiosourceprovider_impl_unittest.cc',
         '../webkit/renderer/fileapi/webfilewriter_base_unittest.cc',
       ],
       'conditions': [
diff --git a/content/renderer/media/media_stream_impl.cc b/content/renderer/media/media_stream_impl.cc
index 79acdf2..7f2de52 100644
--- a/content/renderer/media/media_stream_impl.cc
+++ b/content/renderer/media/media_stream_impl.cc
@@ -26,7 +26,7 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaStreamRegistry.h"
-#include "webkit/media/media_stream_audio_renderer.h"
+#include "webkit/renderer/media/media_stream_audio_renderer.h"
 
 namespace content {
 namespace {
diff --git a/content/renderer/media/media_stream_impl.h b/content/renderer/media/media_stream_impl.h
index edebdae..b9c1235 100644
--- a/content/renderer/media/media_stream_impl.h
+++ b/content/renderer/media/media_stream_impl.h
@@ -22,7 +22,7 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebUserMediaClient.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebUserMediaRequest.h"
 #include "third_party/libjingle/source/talk/app/webrtc/mediastreaminterface.h"
-#include "webkit/media/media_stream_client.h"
+#include "webkit/renderer/media/media_stream_client.h"
 
 namespace webkit_media {
 class MediaStreamAudioRenderer;
diff --git a/content/renderer/media/rtc_video_renderer.h b/content/renderer/media/rtc_video_renderer.h
index 49a3091..311bc7e 100644
--- a/content/renderer/media/rtc_video_renderer.h
+++ b/content/renderer/media/rtc_video_renderer.h
@@ -9,7 +9,7 @@
 #include "content/common/content_export.h"
 #include "third_party/libjingle/source/talk/app/webrtc/mediastreaminterface.h"
 #include "ui/gfx/size.h"
-#include "webkit/media/video_frame_provider.h"
+#include "webkit/renderer/media/video_frame_provider.h"
 
 namespace base {
 class MessageLoopProxy;
diff --git a/content/renderer/media/stream_texture_factory_impl_android.h b/content/renderer/media/stream_texture_factory_impl_android.h
index eb27e57..4c02072 100644
--- a/content/renderer/media/stream_texture_factory_impl_android.h
+++ b/content/renderer/media/stream_texture_factory_impl_android.h
@@ -7,7 +7,7 @@
 
 #include "base/memory/scoped_ptr.h"
 #include "content/renderer/gpu/stream_texture_host_android.h"
-#include "webkit/media/android/stream_texture_factory_android.h"
+#include "webkit/renderer/media/android/stream_texture_factory_android.h"
 
 namespace WebKit {
 class WebGraphicsContext3D;
diff --git a/content/renderer/media/webmediaplayer_proxy_impl_android.cc b/content/renderer/media/webmediaplayer_proxy_impl_android.cc
index 2c69645..f6f4e50 100644
--- a/content/renderer/media/webmediaplayer_proxy_impl_android.cc
+++ b/content/renderer/media/webmediaplayer_proxy_impl_android.cc
@@ -7,8 +7,8 @@
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "content/common/media/media_player_messages_android.h"
-#include "webkit/media/android/webmediaplayer_android.h"
-#include "webkit/media/android/webmediaplayer_manager_android.h"
+#include "webkit/renderer/media/android/webmediaplayer_android.h"
+#include "webkit/renderer/media/android/webmediaplayer_manager_android.h"
 
 namespace content {
 
diff --git a/content/renderer/media/webmediaplayer_proxy_impl_android.h b/content/renderer/media/webmediaplayer_proxy_impl_android.h
index 0247d70..f659560 100644
--- a/content/renderer/media/webmediaplayer_proxy_impl_android.h
+++ b/content/renderer/media/webmediaplayer_proxy_impl_android.h
@@ -8,7 +8,7 @@
 #include <map>
 
 #include "content/public/renderer/render_view_observer.h"
-#include "webkit/media/android/webmediaplayer_proxy_android.h"
+#include "webkit/renderer/media/android/webmediaplayer_proxy_android.h"
 
 namespace webkit_media {
 class WebMediaPlayerAndroid;
diff --git a/content/renderer/media/webrtc_audio_renderer.h b/content/renderer/media/webrtc_audio_renderer.h
index eb1025684..066e5a6 100644
--- a/content/renderer/media/webrtc_audio_renderer.h
+++ b/content/renderer/media/webrtc_audio_renderer.h
@@ -12,7 +12,7 @@
 #include "media/base/audio_decoder.h"
 #include "media/base/audio_pull_fifo.h"
 #include "media/base/audio_renderer_sink.h"
-#include "webkit/media/media_stream_audio_renderer.h"
+#include "webkit/renderer/media/media_stream_audio_renderer.h"
 
 namespace media {
 class AudioOutputDevice;
diff --git a/content/renderer/media/webrtc_local_audio_renderer.h b/content/renderer/media/webrtc_local_audio_renderer.h
index 79e832c..50d6cbf 100644
--- a/content/renderer/media/webrtc_local_audio_renderer.h
+++ b/content/renderer/media/webrtc_local_audio_renderer.h
@@ -12,7 +12,7 @@
 #include "content/common/content_export.h"
 #include "content/renderer/media/webrtc_audio_device_impl.h"
 #include "content/renderer/media/webrtc_local_audio_track.h"
-#include "webkit/media/media_stream_audio_renderer.h"
+#include "webkit/renderer/media/media_stream_audio_renderer.h"
 
 namespace media {
 class AudioBus;
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 3b503e1..d028ce0 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -204,14 +204,14 @@
 #include "webkit/glue/webdropdata.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/glue/weburlresponse_extradata_impl.h"
-#include "webkit/media/webmediaplayer_impl.h"
-#include "webkit/media/webmediaplayer_ms.h"
-#include "webkit/media/webmediaplayer_params.h"
 #include "webkit/plugins/npapi/plugin_list.h"
 #include "webkit/plugins/npapi/plugin_utils.h"
 #include "webkit/plugins/npapi/webplugin_delegate.h"
 #include "webkit/plugins/npapi/webplugin_delegate_impl.h"
 #include "webkit/plugins/npapi/webplugin_impl.h"
+#include "webkit/renderer/media/webmediaplayer_impl.h"
+#include "webkit/renderer/media/webmediaplayer_ms.h"
+#include "webkit/renderer/media/webmediaplayer_params.h"
 
 #if defined(OS_ANDROID)
 #include <cpu-features.h>
@@ -228,8 +228,8 @@
 #include "third_party/WebKit/public/platform/WebFloatRect.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebHitTestResult.h"
 #include "ui/gfx/rect_f.h"
-#include "webkit/media/android/webmediaplayer_android.h"
-#include "webkit/media/android/webmediaplayer_manager_android.h"
+#include "webkit/renderer/media/android/webmediaplayer_android.h"
+#include "webkit/renderer/media/android/webmediaplayer_manager_android.h"
 #elif defined(OS_WIN)
 // TODO(port): these files are currently Windows only because they concern:
 //   * theming
diff --git a/content/renderer/render_view_impl.h b/content/renderer/render_view_impl.h
index d16c446..d1b0f51 100644
--- a/content/renderer/render_view_impl.h
+++ b/content/renderer/render_view_impl.h
@@ -56,8 +56,8 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebViewClient.h"
 #include "ui/surface/transport_dib.h"
 #include "webkit/glue/webpreferences.h"
-#include "webkit/media/webmediaplayer_delegate.h"
 #include "webkit/plugins/npapi/webplugin_page_delegate.h"
+#include "webkit/renderer/media/webmediaplayer_delegate.h"
 
 #if defined(OS_ANDROID)
 #include "content/renderer/android/content_detector.h"
diff --git a/third_party/widevine/cdm/widevine_cdm.gyp b/third_party/widevine/cdm/widevine_cdm.gyp
index 78287a0..2ff4df2 100644
--- a/third_party/widevine/cdm/widevine_cdm.gyp
+++ b/third_party/widevine/cdm/widevine_cdm.gyp
@@ -56,9 +56,9 @@
             'widevine_cdm_binaries',
           ],
           'sources': [
-            '<(DEPTH)/webkit/media/crypto/ppapi/cdm_wrapper.cc',
-            '<(DEPTH)/webkit/media/crypto/ppapi/cdm/content_decryption_module.h',
-            '<(DEPTH)/webkit/media/crypto/ppapi/linked_ptr.h',
+            '<(DEPTH)/webkit/renderer/media/crypto/ppapi/cdm_wrapper.cc',
+            '<(DEPTH)/webkit/renderer/media/crypto/ppapi/cdm/content_decryption_module.h',
+            '<(DEPTH)/webkit/renderer/media/crypto/ppapi/linked_ptr.h',
           ],
           'conditions': [
             [ 'os_posix == 1 and OS != "mac"', {
diff --git a/webkit/glue/simple_webmimeregistry_impl.cc b/webkit/glue/simple_webmimeregistry_impl.cc
index 6e02693..fcf7b4f 100644
--- a/webkit/glue/simple_webmimeregistry_impl.cc
+++ b/webkit/glue/simple_webmimeregistry_impl.cc
@@ -11,7 +11,7 @@
 #include "net/base/mime_util.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "webkit/base/file_path_string_conversions.h"
-#include "webkit/media/crypto/key_systems.h"
+#include "webkit/renderer/media/crypto/key_systems.h"
 
 using WebKit::WebString;
 using WebKit::WebMimeRegistry;
diff --git a/webkit/glue/webkitplatformsupport_impl.cc b/webkit/glue/webkitplatformsupport_impl.cc
index 16cb166..0d33d2e8 100644
--- a/webkit/glue/webkitplatformsupport_impl.cc
+++ b/webkit/glue/webkitplatformsupport_impl.cc
@@ -51,9 +51,9 @@
 #include "webkit/glue/webthread_impl.h"
 #include "webkit/glue/weburlloader_impl.h"
 #include "webkit/glue/worker_task_runner.h"
-#include "webkit/media/audio_decoder.h"
 #include "webkit/plugins/npapi/plugin_instance.h"
 #include "webkit/plugins/webplugininfo.h"
+#include "webkit/renderer/media/audio_decoder.h"
 
 #if defined(OS_ANDROID)
 #include "webkit/glue/fling_animator_impl_android.h"
diff --git a/webkit/glue/webkitplatformsupport_impl.h b/webkit/glue/webkitplatformsupport_impl.h
index 82f3178..5e4acb2 100644
--- a/webkit/glue/webkitplatformsupport_impl.h
+++ b/webkit/glue/webkitplatformsupport_impl.h
@@ -25,7 +25,7 @@
 #include "webkit/glue/webthemeengine_impl_mac.h"
 #elif defined(OS_ANDROID)
 #include "webkit/glue/webthemeengine_impl_android.h"
-#include "webkit/media/audio_decoder.h"
+#include "webkit/renderer/media/audio_decoder.h"
 #endif
 
 namespace base {
diff --git a/webkit/mocks/test_media_stream_client.cc b/webkit/mocks/test_media_stream_client.cc
index 056ccaa..632f6b39 100644
--- a/webkit/mocks/test_media_stream_client.cc
+++ b/webkit/mocks/test_media_stream_client.cc
@@ -11,11 +11,11 @@
 #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h"
 #include "third_party/WebKit/public/platform/WebVector.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaStreamRegistry.h"
-#include "webkit/media/media_stream_audio_renderer.h"
-#include "webkit/media/simple_video_frame_provider.h"
-#include "webkit/media/webmediaplayer_impl.h"
-#include "webkit/media/webmediaplayer_ms.h"
-#include "webkit/media/webmediaplayer_params.h"
+#include "webkit/renderer/media/media_stream_audio_renderer.h"
+#include "webkit/renderer/media/simple_video_frame_provider.h"
+#include "webkit/renderer/media/webmediaplayer_impl.h"
+#include "webkit/renderer/media/webmediaplayer_ms.h"
+#include "webkit/renderer/media/webmediaplayer_params.h"
 
 using namespace WebKit;
 
diff --git a/webkit/mocks/test_media_stream_client.h b/webkit/mocks/test_media_stream_client.h
index c264f4d..b759f49 100644
--- a/webkit/mocks/test_media_stream_client.h
+++ b/webkit/mocks/test_media_stream_client.h
@@ -11,7 +11,7 @@
 
 #include "base/callback_forward.h"
 #include "third_party/WebKit/public/platform/WebURL.h"
-#include "webkit/media/media_stream_client.h"
+#include "webkit/renderer/media/media_stream_client.h"
 
 namespace WebKit {
 class WebFrame;
diff --git a/webkit/media/DEPS b/webkit/renderer/media/DEPS
index c3a5b96..c3a5b96 100644
--- a/webkit/media/DEPS
+++ b/webkit/renderer/media/DEPS
diff --git a/webkit/media/OWNERS b/webkit/renderer/media/OWNERS
index 679494d..679494d 100644
--- a/webkit/media/OWNERS
+++ b/webkit/renderer/media/OWNERS
diff --git a/webkit/media/active_loader.cc b/webkit/renderer/media/active_loader.cc
index b88daf6..7c40e88 100644
--- a/webkit/media/active_loader.cc
+++ b/webkit/renderer/media/active_loader.cc
@@ -1,11 +1,11 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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 "webkit/media/active_loader.h"
+#include "webkit/renderer/media/active_loader.h"
 
 #include "third_party/WebKit/public/platform/WebURLLoader.h"
-#include "webkit/media/buffered_resource_loader.h"
+#include "webkit/renderer/media/buffered_resource_loader.h"
 
 namespace webkit_media {
 
diff --git a/webkit/media/active_loader.h b/webkit/renderer/media/active_loader.h
index 1717307..37fc30e 100644
--- a/webkit/media/active_loader.h
+++ b/webkit/renderer/media/active_loader.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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 WEBKIT_MEDIA_ACTIVE_LOADER_H_
-#define WEBKIT_MEDIA_ACTIVE_LOADER_H_
+#ifndef WEBKIT_RENDERER_MEDIA_ACTIVE_LOADER_H_
+#define WEBKIT_RENDERER_MEDIA_ACTIVE_LOADER_H_
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
@@ -39,4 +39,4 @@ class ActiveLoader {
 
 }  // namespace webkit_media
 
-#endif  // WEBKIT_MEDIA_ACTIVE_LOADER_H_
+#endif  // WEBKIT_RENDERER_MEDIA_ACTIVE_LOADER_H_
diff --git a/webkit/media/android/OWNERS b/webkit/renderer/media/android/OWNERS
index e604870c..e604870c 100644
--- a/webkit/media/android/OWNERS
+++ b/webkit/renderer/media/android/OWNERS
diff --git a/webkit/media/android/audio_decoder_android.cc b/webkit/renderer/media/android/audio_decoder_android.cc
index 05143e8..2d0cb17 100644
--- a/webkit/media/android/audio_decoder_android.cc
+++ b/webkit/renderer/media/android/audio_decoder_android.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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 "webkit/media/audio_decoder.h"
+#include "webkit/renderer/media/audio_decoder.h"
 
 #include <errno.h>
 #include <fcntl.h>
diff --git a/webkit/media/android/media_source_delegate.cc b/webkit/renderer/media/android/media_source_delegate.cc
index f4d53b2..a5fe039 100644
--- a/webkit/media/android/media_source_delegate.cc
+++ b/webkit/renderer/media/android/media_source_delegate.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Copyright 2013 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 "webkit/media/android/media_source_delegate.h"
+#include "webkit/renderer/media/android/media_source_delegate.h"
 
 #include "base/message_loop_proxy.h"
 #include "base/strings/string_number_conversions.h"
@@ -15,11 +15,11 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayerClient.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaSource.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h"
-#include "webkit/media/android/webmediaplayer_proxy_android.h"
-#include "webkit/media/crypto/key_systems.h"
-#include "webkit/media/crypto/proxy_decryptor.h"
-#include "webkit/media/webmediaplayer_util.h"
-#include "webkit/media/webmediasourceclient_impl.h"
+#include "webkit/renderer/media/android/webmediaplayer_proxy_android.h"
+#include "webkit/renderer/media/crypto/key_systems.h"
+#include "webkit/renderer/media/crypto/proxy_decryptor.h"
+#include "webkit/renderer/media/webmediaplayer_util.h"
+#include "webkit/renderer/media/webmediasourceclient_impl.h"
 
 using media::DemuxerStream;
 using media::MediaPlayerHostMsg_DemuxerReady_Params;
diff --git a/webkit/media/android/media_source_delegate.h b/webkit/renderer/media/android/media_source_delegate.h
index 3c5ddf6..5e3d2c3 100644
--- a/webkit/media/android/media_source_delegate.h
+++ b/webkit/renderer/media/android/media_source_delegate.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Copyright 2013 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 WEBKIT_MEDIA_ANDROID_MEDIA_SOURCE_DELEGATE_H_
-#define WEBKIT_MEDIA_ANDROID_MEDIA_SOURCE_DELEGATE_H_
+#ifndef WEBKIT_RENDERER_MEDIA_ANDROID_MEDIA_SOURCE_DELEGATE_H_
+#define WEBKIT_RENDERER_MEDIA_ANDROID_MEDIA_SOURCE_DELEGATE_H_
 
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
@@ -179,4 +179,4 @@ class MediaSourceDelegate : public media::DemuxerHost {
 };
 
 }  // namespace webkit_media
-#endif  // WEBKIT_MEDIA_ANDROID_MEDIA_SOURCE_DELEGATE_H_
+#endif  // WEBKIT_RENDERER_MEDIA_ANDROID_MEDIA_SOURCE_DELEGATE_H_
diff --git a/webkit/media/android/stream_texture_factory_android.h b/webkit/renderer/media/android/stream_texture_factory_android.h
index ba83a44..a9aab0e 100644
--- a/webkit/media/android/stream_texture_factory_android.h
+++ b/webkit/renderer/media/android/stream_texture_factory_android.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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 WEBKIT_MEDIA_ANDROID_STREAM_TEXTURE_FACTORY_ANDROID_H_
-#define WEBKIT_MEDIA_ANDROID_STREAM_TEXTURE_FACTORY_ANDROID_H_
+#ifndef WEBKIT_RENDERER_MEDIA_ANDROID_STREAM_TEXTURE_FACTORY_ANDROID_H_
+#define WEBKIT_RENDERER_MEDIA_ANDROID_STREAM_TEXTURE_FACTORY_ANDROID_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "cc/layers/video_frame_provider.h"
@@ -61,4 +61,4 @@ class StreamTextureFactory {
 
 } // namespace webkit_media
 
-#endif  // WEBKIT_MEDIA_ANDROID_STREAM_TEXTURE_FACTORY_ANDROID_H_
+#endif  // WEBKIT_RENDERER_MEDIA_ANDROID_STREAM_TEXTURE_FACTORY_ANDROID_H_
diff --git a/webkit/media/android/webmediaplayer_android.cc b/webkit/renderer/media/android/webmediaplayer_android.cc
index 03f05b1..c8b9716 100644
--- a/webkit/media/android/webmediaplayer_android.cc
+++ b/webkit/renderer/media/android/webmediaplayer_android.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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 "webkit/media/android/webmediaplayer_android.h"
+#include "webkit/renderer/media/android/webmediaplayer_android.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ -21,10 +21,10 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayerClient.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaSource.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
-#include "webkit/media/android/webmediaplayer_manager_android.h"
-#include "webkit/media/android/webmediaplayer_proxy_android.h"
-#include "webkit/media/webmediaplayer_util.h"
 #include "webkit/renderer/compositor_bindings/web_layer_impl.h"
+#include "webkit/renderer/media/android/webmediaplayer_manager_android.h"
+#include "webkit/renderer/media/android/webmediaplayer_proxy_android.h"
+#include "webkit/renderer/media/webmediaplayer_util.h"
 
 static const uint32 kGLTextureExternalOES = 0x8D65;
 
diff --git a/webkit/media/android/webmediaplayer_android.h b/webkit/renderer/media/android/webmediaplayer_android.h
index c0fdee3..d4ea1388 100644
--- a/webkit/media/android/webmediaplayer_android.h
+++ b/webkit/renderer/media/android/webmediaplayer_android.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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 WEBKIT_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_
-#define WEBKIT_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_
+#ifndef WEBKIT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_
+#define WEBKIT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_
 
 #include <jni.h>
 
@@ -12,15 +12,15 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/time.h"
-#include "media/base/demuxer_stream.h"
 #include "cc/layers/video_frame_provider.h"
+#include "media/base/demuxer_stream.h"
 #include "third_party/WebKit/public/platform/WebGraphicsContext3D.h"
 #include "third_party/WebKit/public/platform/WebSize.h"
 #include "third_party/WebKit/public/platform/WebURL.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayer.h"
 #include "ui/gfx/rect_f.h"
-#include "webkit/media/android/media_source_delegate.h"
-#include "webkit/media/android/stream_texture_factory_android.h"
+#include "webkit/renderer/media/android/media_source_delegate.h"
+#include "webkit/renderer/media/android/stream_texture_factory_android.h"
 
 namespace media {
 class MediaLog;
@@ -328,4 +328,4 @@ class WebMediaPlayerAndroid
 
 }  // namespace webkit_media
 
-#endif  // WEBKIT_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_
+#endif  // WEBKIT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_
diff --git a/webkit/media/android/webmediaplayer_manager_android.cc b/webkit/renderer/media/android/webmediaplayer_manager_android.cc
index 80296d9..b3f256c 100644
--- a/webkit/media/android/webmediaplayer_manager_android.cc
+++ b/webkit/renderer/media/android/webmediaplayer_manager_android.cc
@@ -1,11 +1,11 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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 "webkit/media/android/webmediaplayer_manager_android.h"
+#include "webkit/renderer/media/android/webmediaplayer_manager_android.h"
 
 #include "ui/gfx/rect_f.h"
-#include "webkit/media/android/webmediaplayer_android.h"
+#include "webkit/renderer/media/android/webmediaplayer_android.h"
 
 namespace webkit_media {
 
diff --git a/webkit/media/android/webmediaplayer_manager_android.h b/webkit/renderer/media/android/webmediaplayer_manager_android.h
index 30de485..a32d178 100644
--- a/webkit/media/android/webmediaplayer_manager_android.h
+++ b/webkit/renderer/media/android/webmediaplayer_manager_android.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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 WEBKIT_MEDIA_ANDROID_WEBMEDIAPLAYER_MANAGER_ANDROID_H_
-#define WEBKIT_MEDIA_ANDROID_WEBMEDIAPLAYER_MANAGER_ANDROID_H_
+#ifndef WEBKIT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_MANAGER_ANDROID_H_
+#define WEBKIT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_MANAGER_ANDROID_H_
 
 #include <map>
 
@@ -69,4 +69,4 @@ class WebMediaPlayerManagerAndroid {
 
 }  // namespace webkit_media
 
-#endif  // WEBKIT_MEDIA_ANDROID_WEBMEDIAPLAYER_MANAGER_ANDROID_H_
+#endif  // WEBKIT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_MANAGER_ANDROID_H_
diff --git a/webkit/media/android/webmediaplayer_proxy_android.cc b/webkit/renderer/media/android/webmediaplayer_proxy_android.cc
index 626fcaf..55b3e07 100644
--- a/webkit/media/android/webmediaplayer_proxy_android.cc
+++ b/webkit/renderer/media/android/webmediaplayer_proxy_android.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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 "webkit/media/android/webmediaplayer_proxy_android.h"
+#include "webkit/renderer/media/android/webmediaplayer_proxy_android.h"
 
 namespace webkit_media {
 
diff --git a/webkit/media/android/webmediaplayer_proxy_android.h b/webkit/renderer/media/android/webmediaplayer_proxy_android.h
index 7e4f8a5..4f5bdfd 100644
--- a/webkit/media/android/webmediaplayer_proxy_android.h
+++ b/webkit/renderer/media/android/webmediaplayer_proxy_android.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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 WEBKIT_MEDIA_ANDROID_WEBMEDIAPLAYER_PROXY_ANDROID_H_
-#define WEBKIT_MEDIA_ANDROID_WEBMEDIAPLAYER_PROXY_ANDROID_H_
+#ifndef WEBKIT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_PROXY_ANDROID_H_
+#define WEBKIT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_PROXY_ANDROID_H_
 
 #include <string>
 
@@ -66,4 +66,4 @@ class WebMediaPlayerProxyAndroid {
 
 }  // namespace webkit_media
 
-#endif  // WEBKIT_MEDIA_ANDROID_WEBMEDIAPLAYER_PROXY_ANDROID_H_
+#endif  // WEBKIT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_PROXY_ANDROID_H_
diff --git a/webkit/media/audio_decoder.cc b/webkit/renderer/media/audio_decoder.cc
index 617e291..428c588 100644
--- a/webkit/media/audio_decoder.cc
+++ b/webkit/renderer/media/audio_decoder.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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 "webkit/media/audio_decoder.h"
+#include "webkit/renderer/media/audio_decoder.h"
 
 #include <vector>
 #include "base/basictypes.h"
diff --git a/webkit/media/audio_decoder.h b/webkit/renderer/media/audio_decoder.h
index 6ec6886..2f9561a 100644
--- a/webkit/media/audio_decoder.h
+++ b/webkit/renderer/media/audio_decoder.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright 2013 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 WEBKIT_MEDIA_AUDIO_DECODER_H_
-#define WEBKIT_MEDIA_AUDIO_DECODER_H_
+#ifndef WEBKIT_RENDERER_MEDIA_AUDIO_DECODER_H_
+#define WEBKIT_RENDERER_MEDIA_AUDIO_DECODER_H_
 
 #include "base/basictypes.h"
 
@@ -36,4 +36,4 @@ bool DecodeAudioFileData(WebKit::WebAudioBus* destination_bus, const char* data,
 
 }  // namespace webkit_media
 
-#endif  // WEBKIT_MEDIA_AUDIO_DECODER_H_
+#endif  // WEBKIT_RENDERER_MEDIA_AUDIO_DECODER_H_
diff --git a/webkit/media/buffered_data_source.cc b/webkit/renderer/media/buffered_data_source.cc
index 67341c5..cb443e1 100644
--- a/webkit/media/buffered_data_source.cc
+++ b/webkit/renderer/media/buffered_data_source.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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 "webkit/media/buffered_data_source.h"
+#include "webkit/renderer/media/buffered_data_source.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
diff --git a/webkit/media/buffered_data_source.h b/webkit/renderer/media/buffered_data_source.h
index f85e0c6..eda3cb2 100644
--- a/webkit/media/buffered_data_source.h
+++ b/webkit/renderer/media/buffered_data_source.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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 WEBKIT_MEDIA_BUFFERED_DATA_SOURCE_H_
-#define WEBKIT_MEDIA_BUFFERED_DATA_SOURCE_H_
+#ifndef WEBKIT_RENDERER_MEDIA_BUFFERED_DATA_SOURCE_H_
+#define WEBKIT_RENDERER_MEDIA_BUFFERED_DATA_SOURCE_H_
 
 #include <string>
 
@@ -13,8 +13,8 @@
 #include "googleurl/src/gurl.h"
 #include "media/base/data_source.h"
 #include "media/base/ranges.h"
-#include "webkit/media/buffered_resource_loader.h"
-#include "webkit/media/preload.h"
+#include "webkit/renderer/media/buffered_resource_loader.h"
+#include "webkit/renderer/media/preload.h"
 
 namespace base {
 class MessageLoopProxy;
@@ -217,4 +217,4 @@ class BufferedDataSource : public media::DataSource {
 
 }  // namespace webkit_media
 
-#endif  // WEBKIT_MEDIA_BUFFERED_DATA_SOURCE_H_
+#endif  // WEBKIT_RENDERER_MEDIA_BUFFERED_DATA_SOURCE_H_
diff --git a/webkit/media/buffered_data_source_unittest.cc b/webkit/renderer/media/buffered_data_source_unittest.cc
index f2e9241..63895b3 100644
--- a/webkit/media/buffered_data_source_unittest.cc
+++ b/webkit/renderer/media/buffered_data_source_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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.
 
@@ -10,10 +10,10 @@
 #include "media/base/test_helpers.h"
 #include "third_party/WebKit/public/platform/WebURLResponse.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
-#include "webkit/media/buffered_data_source.h"
 #include "webkit/mocks/mock_webframeclient.h"
 #include "webkit/mocks/mock_weburlloader.h"
-#include "webkit/media/test_response_generator.h"
+#include "webkit/renderer/media/buffered_data_source.h"
+#include "webkit/renderer/media/test_response_generator.h"
 
 using ::testing::_;
 using ::testing::Assign;
diff --git a/webkit/media/buffered_resource_loader.cc b/webkit/renderer/media/buffered_resource_loader.cc
index 8bc5b24..8e300b5 100644
--- a/webkit/media/buffered_resource_loader.cc
+++ b/webkit/renderer/media/buffered_resource_loader.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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 "webkit/media/buffered_resource_loader.h"
+#include "webkit/renderer/media/buffered_resource_loader.h"
 
 #include "base/bits.h"
 #include "base/callback_helpers.h"
@@ -18,7 +18,7 @@
 #include "third_party/WebKit/public/platform/WebURLResponse.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLLoaderOptions.h"
-#include "webkit/media/cache_util.h"
+#include "webkit/renderer/media/cache_util.h"
 
 using WebKit::WebFrame;
 using WebKit::WebString;
diff --git a/webkit/media/buffered_resource_loader.h b/webkit/renderer/media/buffered_resource_loader.h
index 274cf30..b01b2d2 100644
--- a/webkit/media/buffered_resource_loader.h
+++ b/webkit/renderer/media/buffered_resource_loader.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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 WEBKIT_MEDIA_BUFFERED_RESOURCE_LOADER_H_
-#define WEBKIT_MEDIA_BUFFERED_RESOURCE_LOADER_H_
+#ifndef WEBKIT_RENDERER_MEDIA_BUFFERED_RESOURCE_LOADER_H_
+#define WEBKIT_RENDERER_MEDIA_BUFFERED_RESOURCE_LOADER_H_
 
 #include <string>
 
@@ -16,7 +16,7 @@
 #include "third_party/WebKit/public/platform/WebURLLoaderClient.h"
 #include "third_party/WebKit/public/platform/WebURLRequest.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
-#include "webkit/media/active_loader.h"
+#include "webkit/renderer/media/active_loader.h"
 
 namespace media {
 class MediaLog;
@@ -328,4 +328,4 @@ class BufferedResourceLoader : public WebKit::WebURLLoaderClient {
 
 }  // namespace webkit_media
 
-#endif  // WEBKIT_MEDIA_BUFFERED_RESOURCE_LOADER_H_
+#endif  // WEBKIT_RENDERER_MEDIA_BUFFERED_RESOURCE_LOADER_H_
diff --git a/webkit/media/buffered_resource_loader_unittest.cc b/webkit/renderer/media/buffered_resource_loader_unittest.cc
index 5d08e75..6e7bd9f 100644
--- a/webkit/media/buffered_resource_loader_unittest.cc
+++ b/webkit/renderer/media/buffered_resource_loader_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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.
 
@@ -20,9 +20,9 @@
 #include "third_party/WebKit/public/platform/WebURLResponse.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
-#include "webkit/media/buffered_resource_loader.h"
 #include "webkit/mocks/mock_webframeclient.h"
 #include "webkit/mocks/mock_weburlloader.h"
+#include "webkit/renderer/media/buffered_resource_loader.h"
 
 using ::testing::_;
 using ::testing::InSequence;
diff --git a/webkit/media/cache_util.cc b/webkit/renderer/media/cache_util.cc
index 773fa29..788ad79 100644
--- a/webkit/media/cache_util.cc
+++ b/webkit/renderer/media/cache_util.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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 "webkit/media/cache_util.h"
+#include "webkit/renderer/media/cache_util.h"
 
 #include <string>
 
diff --git a/webkit/media/cache_util.h b/webkit/renderer/media/cache_util.h
index 1cb3c3d6..7512804 100644
--- a/webkit/media/cache_util.h
+++ b/webkit/renderer/media/cache_util.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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 WEBKIT_MEDIA_CACHE_UTIL_H_
-#define WEBKIT_MEDIA_CACHE_UTIL_H_
+#ifndef WEBKIT_RENDERER_MEDIA_CACHE_UTIL_H_
+#define WEBKIT_RENDERER_MEDIA_CACHE_UTIL_H_
 
 #include <vector>
 
@@ -36,4 +36,4 @@ uint32 GetReasonsForUncacheability(const WebKit::WebURLResponse& response);
 
 }  // namespace webkit_media
 
-#endif  // WEBKIT_MEDIA_CACHE_UTIL_H_
+#endif  // WEBKIT_RENDERER_MEDIA_CACHE_UTIL_H_
diff --git a/webkit/media/cache_util_unittest.cc b/webkit/renderer/media/cache_util_unittest.cc
index f86e0c0..d774d30 100644
--- a/webkit/media/cache_util_unittest.cc
+++ b/webkit/renderer/media/cache_util_unittest.cc
@@ -1,14 +1,14 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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 "webkit/media/cache_util.h"
+#include "webkit/renderer/media/cache_util.h"
 
 #include <string>
 
 #include "base/format_macros.h"
-#include "base/stringprintf.h"
 #include "base/string_util.h"
+#include "base/stringprintf.h"
 #include "base/strings/string_number_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/public/platform/WebString.h"
diff --git a/webkit/media/crypto/key_systems.cc b/webkit/renderer/media/crypto/key_systems.cc
index 810fd71..7e837f5 100644
--- a/webkit/media/crypto/key_systems.cc
+++ b/webkit/renderer/media/crypto/key_systems.cc
@@ -1,10 +1,10 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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 <map>
 
-#include "webkit/media/crypto/key_systems.h"
+#include "webkit/renderer/media/crypto/key_systems.h"
 
 #include "base/lazy_instance.h"
 #include "base/logging.h"
@@ -12,7 +12,7 @@
 #include "net/base/mime_util.h"
 #include "third_party/WebKit/public/platform/WebCString.h"
 #include "third_party/WebKit/public/platform/WebString.h"
-#include "webkit/media/crypto/key_systems_info.h"
+#include "webkit/renderer/media/crypto/key_systems_info.h"
 
 namespace webkit_media {
 
diff --git a/webkit/media/crypto/key_systems.h b/webkit/renderer/media/crypto/key_systems.h
index 41412a4..1332bad 100644
--- a/webkit/media/crypto/key_systems.h
+++ b/webkit/renderer/media/crypto/key_systems.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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 WEBKIT_MEDIA_CRYPTO_KEY_SYSTEMS_H_
-#define WEBKIT_MEDIA_CRYPTO_KEY_SYSTEMS_H_
+#ifndef WEBKIT_RENDERER_MEDIA_CRYPTO_KEY_SYSTEMS_H_
+#define WEBKIT_RENDERER_MEDIA_CRYPTO_KEY_SYSTEMS_H_
 
 #include <string>
 #include <vector>
@@ -42,4 +42,4 @@ std::string GetPepperType(const std::string& key_system);
 
 }  // namespace webkit_media
 
-#endif  // WEBKIT_MEDIA_CRYPTO_KEY_SYSTEMS_H_
+#endif  // WEBKIT_RENDERER_MEDIA_CRYPTO_KEY_SYSTEMS_H_
diff --git a/webkit/media/crypto/key_systems_info.cc b/webkit/renderer/media/crypto/key_systems_info.cc
index afe1aba..010ed23 100644
--- a/webkit/media/crypto/key_systems_info.cc
+++ b/webkit/renderer/media/crypto/key_systems_info.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Copyright 2013 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 "webkit/media/crypto/key_systems_info.h"
+#include "webkit/renderer/media/crypto/key_systems_info.h"
 
 #include "base/basictypes.h"
 
diff --git a/webkit/media/crypto/key_systems_info.h b/webkit/renderer/media/crypto/key_systems_info.h
index e94aad7..924be72 100644
--- a/webkit/media/crypto/key_systems_info.h
+++ b/webkit/renderer/media/crypto/key_systems_info.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Copyright 2013 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 WEBKIT_MEDIA_CRYPTO_KEY_SYSTEMS_INFO_H_
-#define WEBKIT_MEDIA_CRYPTO_KEY_SYSTEMS_INFO_H_
+#ifndef WEBKIT_RENDERER_MEDIA_CRYPTO_KEY_SYSTEMS_INFO_H_
+#define WEBKIT_RENDERER_MEDIA_CRYPTO_KEY_SYSTEMS_INFO_H_
 
 #include <string>
 
@@ -50,4 +50,4 @@ bool CanUseBuiltInAesDecryptor(const std::string& key_system);
 
 }  // namespace webkit_media
 
-#endif  // WEBKIT_MEDIA_CRYPTO_KEY_SYSTEMS_INFO_H_
+#endif  // WEBKIT_RENDERER_MEDIA_CRYPTO_KEY_SYSTEMS_INFO_H_
diff --git a/webkit/media/crypto/key_systems_unittest.cc b/webkit/renderer/media/crypto/key_systems_unittest.cc
index 489abf9..efd318d 100644
--- a/webkit/media/crypto/key_systems_unittest.cc
+++ b/webkit/renderer/media/crypto/key_systems_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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.
 
@@ -7,7 +7,7 @@
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/public/platform/WebString.h"
-#include "webkit/media/crypto/key_systems.h"
+#include "webkit/renderer/media/crypto/key_systems.h"
 
 #include "widevine_cdm_version.h"  // In SHARED_INTERMEDIATE_DIR.
 
diff --git a/webkit/media/crypto/ppapi/DEPS b/webkit/renderer/media/crypto/ppapi/DEPS
index 00317f1..00317f1 100644
--- a/webkit/media/crypto/ppapi/DEPS
+++ b/webkit/renderer/media/crypto/ppapi/DEPS
diff --git a/webkit/media/crypto/ppapi/cdm_video_decoder.cc b/webkit/renderer/media/crypto/ppapi/cdm_video_decoder.cc
index 935921f..5f2d71d 100644
--- a/webkit/media/crypto/ppapi/cdm_video_decoder.cc
+++ b/webkit/renderer/media/crypto/ppapi/cdm_video_decoder.cc
@@ -1,22 +1,22 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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 "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
-#include "webkit/media/crypto/ppapi/cdm/content_decryption_module.h"
-#include "webkit/media/crypto/ppapi/cdm_video_decoder.h"
+#include "webkit/renderer/media/crypto/ppapi/cdm/content_decryption_module.h"
+#include "webkit/renderer/media/crypto/ppapi/cdm_video_decoder.h"
 
 #if defined(CLEAR_KEY_CDM_USE_FAKE_VIDEO_DECODER)
-#include "webkit/media/crypto/ppapi/fake_cdm_video_decoder.h"
+#include "webkit/renderer/media/crypto/ppapi/fake_cdm_video_decoder.h"
 #endif
 
 #if defined(CLEAR_KEY_CDM_USE_FFMPEG_DECODER)
-#include "webkit/media/crypto/ppapi/ffmpeg_cdm_video_decoder.h"
+#include "webkit/renderer/media/crypto/ppapi/ffmpeg_cdm_video_decoder.h"
 #endif
 
 #if defined(CLEAR_KEY_CDM_USE_LIBVPX_DECODER)
-#include "webkit/media/crypto/ppapi/libvpx_cdm_video_decoder.h"
+#include "webkit/renderer/media/crypto/ppapi/libvpx_cdm_video_decoder.h"
 #endif
 
 namespace webkit_media {
diff --git a/webkit/media/crypto/ppapi/cdm_video_decoder.h b/webkit/renderer/media/crypto/ppapi/cdm_video_decoder.h
index 7b29eff..86caff9 100644
--- a/webkit/media/crypto/ppapi/cdm_video_decoder.h
+++ b/webkit/renderer/media/crypto/ppapi/cdm_video_decoder.h
@@ -1,13 +1,13 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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 WEBKIT_MEDIA_CRYPTO_PPAPI_CDM_VIDEO_DECODER_H_
-#define WEBKIT_MEDIA_CRYPTO_PPAPI_CDM_VIDEO_DECODER_H_
+#ifndef WEBKIT_RENDERER_MEDIA_CRYPTO_PPAPI_CDM_VIDEO_DECODER_H_
+#define WEBKIT_RENDERER_MEDIA_CRYPTO_PPAPI_CDM_VIDEO_DECODER_H_
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
-#include "webkit/media/crypto/ppapi/cdm/content_decryption_module.h"
+#include "webkit/renderer/media/crypto/ppapi/cdm/content_decryption_module.h"
 
 namespace webkit_media {
 
@@ -40,4 +40,4 @@ scoped_ptr<CdmVideoDecoder> CreateVideoDecoder(
 
 }  // namespace webkit_media
 
-#endif  // WEBKIT_MEDIA_CRYPTO_PPAPI_CDM_VIDEO_DECODER_H_
+#endif  // WEBKIT_RENDERER_MEDIA_CRYPTO_PPAPI_CDM_VIDEO_DECODER_H_
diff --git a/webkit/media/crypto/ppapi/cdm_wrapper.cc b/webkit/renderer/media/crypto/ppapi/cdm_wrapper.cc
index 72d92cc..e5c338d 100644
--- a/webkit/media/crypto/ppapi/cdm_wrapper.cc
+++ b/webkit/renderer/media/crypto/ppapi/cdm_wrapper.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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.
 
@@ -15,18 +15,18 @@
 #include "ppapi/c/private/pp_content_decryptor.h"
 #include "ppapi/cpp/completion_callback.h"
 #include "ppapi/cpp/core.h"
+#include "ppapi/cpp/dev/buffer_dev.h"
 #include "ppapi/cpp/instance.h"
 #include "ppapi/cpp/logging.h"
 #include "ppapi/cpp/module.h"
 #include "ppapi/cpp/pass_ref.h"
+#include "ppapi/cpp/private/content_decryptor_private.h"
 #include "ppapi/cpp/resource.h"
 #include "ppapi/cpp/var.h"
 #include "ppapi/cpp/var_array_buffer.h"
-#include "ppapi/cpp/dev/buffer_dev.h"
-#include "ppapi/cpp/private/content_decryptor_private.h"
 #include "ppapi/utility/completion_callback_factory.h"
-#include "webkit/media/crypto/ppapi/cdm/content_decryption_module.h"
-#include "webkit/media/crypto/ppapi/linked_ptr.h"
+#include "webkit/renderer/media/crypto/ppapi/cdm/content_decryption_module.h"
+#include "webkit/renderer/media/crypto/ppapi/linked_ptr.h"
 
 #if defined(CHECK_DOCUMENT_URL)
 #include "ppapi/cpp/dev/url_util_dev.h"
diff --git a/webkit/media/crypto/ppapi/clear_key_cdm.cc b/webkit/renderer/media/crypto/ppapi/clear_key_cdm.cc
index 94ea181..b72a290 100644
--- a/webkit/media/crypto/ppapi/clear_key_cdm.cc
+++ b/webkit/renderer/media/crypto/ppapi/clear_key_cdm.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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 "webkit/media/crypto/ppapi/clear_key_cdm.h"
+#include "webkit/renderer/media/crypto/ppapi/clear_key_cdm.h"
 
 #include <algorithm>
 #include <sstream>
@@ -15,7 +15,7 @@
 #include "base/time.h"
 #include "media/base/decoder_buffer.h"
 #include "media/base/decrypt_config.h"
-#include "webkit/media/crypto/ppapi/cdm_video_decoder.h"
+#include "webkit/renderer/media/crypto/ppapi/cdm_video_decoder.h"
 
 #if defined(CLEAR_KEY_CDM_USE_FAKE_AUDIO_DECODER)
 #include "base/basictypes.h"
@@ -27,8 +27,8 @@ static const int64 kNoTimestamp = kint64min;
 #include "base/files/file_path.h"
 #include "base/path_service.h"
 #include "media/base/media.h"
-#include "webkit/media/crypto/ppapi/ffmpeg_cdm_audio_decoder.h"
-#include "webkit/media/crypto/ppapi/ffmpeg_cdm_video_decoder.h"
+#include "webkit/renderer/media/crypto/ppapi/ffmpeg_cdm_audio_decoder.h"
+#include "webkit/renderer/media/crypto/ppapi/ffmpeg_cdm_video_decoder.h"
 
 // Include FFmpeg avformat.h for av_register_all().
 extern "C" {
diff --git a/webkit/media/crypto/ppapi/clear_key_cdm.h b/webkit/renderer/media/crypto/ppapi/clear_key_cdm.h
index 8b1715b..822c9c4 100644
--- a/webkit/media/crypto/ppapi/clear_key_cdm.h
+++ b/webkit/renderer/media/crypto/ppapi/clear_key_cdm.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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 WEBKIT_MEDIA_CRYPTO_PPAPI_CLEAR_KEY_CDM_H_
-#define WEBKIT_MEDIA_CRYPTO_PPAPI_CLEAR_KEY_CDM_H_
+#ifndef WEBKIT_RENDERER_MEDIA_CRYPTO_PPAPI_CLEAR_KEY_CDM_H_
+#define WEBKIT_RENDERER_MEDIA_CRYPTO_PPAPI_CLEAR_KEY_CDM_H_
 
 #include <string>
 
@@ -13,7 +13,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/synchronization/lock.h"
 #include "media/crypto/aes_decryptor.h"
-#include "webkit/media/crypto/ppapi/cdm/content_decryption_module.h"
+#include "webkit/renderer/media/crypto/ppapi/cdm/content_decryption_module.h"
 
 // Enable this to use the fake decoder for testing.
 // TODO(tomfinegan): Move fake audio decoder into a separate class.
@@ -173,4 +173,4 @@ class ClearKeyCdm : public cdm::ContentDecryptionModule {
 
 }  // namespace webkit_media
 
-#endif  // WEBKIT_MEDIA_CRYPTO_PPAPI_CLEAR_KEY_CDM_H_
+#endif  // WEBKIT_RENDERER_MEDIA_CRYPTO_PPAPI_CLEAR_KEY_CDM_H_
diff --git a/webkit/media/crypto/ppapi/fake_cdm_video_decoder.cc b/webkit/renderer/media/crypto/ppapi/fake_cdm_video_decoder.cc
index 62d3383..1870621 100644
--- a/webkit/media/crypto/ppapi/fake_cdm_video_decoder.cc
+++ b/webkit/renderer/media/crypto/ppapi/fake_cdm_video_decoder.cc
@@ -1,11 +1,11 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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 "webkit/media/crypto/ppapi/fake_cdm_video_decoder.h"
+#include "webkit/renderer/media/crypto/ppapi/fake_cdm_video_decoder.h"
 
 #include "base/logging.h"
-#include "webkit/media/crypto/ppapi/cdm/content_decryption_module.h"
+#include "webkit/renderer/media/crypto/ppapi/cdm/content_decryption_module.h"
 
 namespace webkit_media {
 
diff --git a/webkit/media/crypto/ppapi/fake_cdm_video_decoder.h b/webkit/renderer/media/crypto/ppapi/fake_cdm_video_decoder.h
index d3cb066..7c110e2 100644
--- a/webkit/media/crypto/ppapi/fake_cdm_video_decoder.h
+++ b/webkit/renderer/media/crypto/ppapi/fake_cdm_video_decoder.h
@@ -1,14 +1,14 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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 WEBKIT_MEDIA_CRYPTO_PPAPI_FAKE_CDM_VIDEO_DECODER_H_
-#define WEBKIT_MEDIA_CRYPTO_PPAPI_FAKE_CDM_VIDEO_DECODER_H_
+#ifndef WEBKIT_RENDERER_MEDIA_CRYPTO_PPAPI_FAKE_CDM_VIDEO_DECODER_H_
+#define WEBKIT_RENDERER_MEDIA_CRYPTO_PPAPI_FAKE_CDM_VIDEO_DECODER_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
-#include "webkit/media/crypto/ppapi/cdm/content_decryption_module.h"
-#include "webkit/media/crypto/ppapi/cdm_video_decoder.h"
+#include "webkit/renderer/media/crypto/ppapi/cdm/content_decryption_module.h"
+#include "webkit/renderer/media/crypto/ppapi/cdm_video_decoder.h"
 
 namespace webkit_media {
 
@@ -38,4 +38,4 @@ class FakeCdmVideoDecoder : public CdmVideoDecoder {
 
 }  // namespace webkit_media
 
-#endif  // WEBKIT_MEDIA_CRYPTO_PPAPI_FAKE_CDM_VIDEO_DECODER_H_
+#endif  // WEBKIT_RENDERER_MEDIA_CRYPTO_PPAPI_FAKE_CDM_VIDEO_DECODER_H_
diff --git a/webkit/media/crypto/ppapi/ffmpeg_cdm_audio_decoder.cc b/webkit/renderer/media/crypto/ppapi/ffmpeg_cdm_audio_decoder.cc
index dee557e..2f7ac2f 100644
--- a/webkit/media/crypto/ppapi/ffmpeg_cdm_audio_decoder.cc
+++ b/webkit/renderer/media/crypto/ppapi/ffmpeg_cdm_audio_decoder.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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 "webkit/media/crypto/ppapi/ffmpeg_cdm_audio_decoder.h"
+#include "webkit/renderer/media/crypto/ppapi/ffmpeg_cdm_audio_decoder.h"
 
 #include <algorithm>
 
@@ -12,7 +12,7 @@
 #include "media/base/buffers.h"
 #include "media/base/data_buffer.h"
 #include "media/base/limits.h"
-#include "webkit/media/crypto/ppapi/cdm/content_decryption_module.h"
+#include "webkit/renderer/media/crypto/ppapi/cdm/content_decryption_module.h"
 
 // Include FFmpeg header files.
 extern "C" {
diff --git a/webkit/media/crypto/ppapi/ffmpeg_cdm_audio_decoder.h b/webkit/renderer/media/crypto/ppapi/ffmpeg_cdm_audio_decoder.h
index 1c2c819..b67d0cb 100644
--- a/webkit/media/crypto/ppapi/ffmpeg_cdm_audio_decoder.h
+++ b/webkit/renderer/media/crypto/ppapi/ffmpeg_cdm_audio_decoder.h
@@ -1,17 +1,17 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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 WEBKIT_MEDIA_CRYPTO_PPAPI_FFMPEG_CDM_AUDIO_DECODER_H_
-#define WEBKIT_MEDIA_CRYPTO_PPAPI_FFMPEG_CDM_AUDIO_DECODER_H_
+#ifndef WEBKIT_RENDERER_MEDIA_CRYPTO_PPAPI_FFMPEG_CDM_AUDIO_DECODER_H_
+#define WEBKIT_RENDERER_MEDIA_CRYPTO_PPAPI_FFMPEG_CDM_AUDIO_DECODER_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
+#include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time.h"
-#include "base/compiler_specific.h"
-#include "webkit/media/crypto/ppapi/cdm/content_decryption_module.h"
+#include "webkit/renderer/media/crypto/ppapi/cdm/content_decryption_module.h"
 
 struct AVCodecContext;
 struct AVFrame;
@@ -96,4 +96,4 @@ class FFmpegCdmAudioDecoder {
 
 }  // namespace webkit_media
 
-#endif  // WEBKIT_MEDIA_CRYPTO_PPAPI_FFMPEG_CDM_AUDIO_DECODER_H_
+#endif  // WEBKIT_RENDERER_MEDIA_CRYPTO_PPAPI_FFMPEG_CDM_AUDIO_DECODER_H_
diff --git a/webkit/media/crypto/ppapi/ffmpeg_cdm_video_decoder.cc b/webkit/renderer/media/crypto/ppapi/ffmpeg_cdm_video_decoder.cc
index 6df16f9..faaa8f7 100644
--- a/webkit/media/crypto/ppapi/ffmpeg_cdm_video_decoder.cc
+++ b/webkit/renderer/media/crypto/ppapi/ffmpeg_cdm_video_decoder.cc
@@ -1,14 +1,14 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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 "webkit/media/crypto/ppapi/ffmpeg_cdm_video_decoder.h"
+#include "webkit/renderer/media/crypto/ppapi/ffmpeg_cdm_video_decoder.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "media/base/buffers.h"
 #include "media/base/limits.h"
-#include "webkit/media/crypto/ppapi/cdm/content_decryption_module.h"
+#include "webkit/renderer/media/crypto/ppapi/cdm/content_decryption_module.h"
 
 // Include FFmpeg header files.
 extern "C" {
diff --git a/webkit/media/crypto/ppapi/ffmpeg_cdm_video_decoder.h b/webkit/renderer/media/crypto/ppapi/ffmpeg_cdm_video_decoder.h
index a551954..5c4bb2b 100644
--- a/webkit/media/crypto/ppapi/ffmpeg_cdm_video_decoder.h
+++ b/webkit/renderer/media/crypto/ppapi/ffmpeg_cdm_video_decoder.h
@@ -1,14 +1,14 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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 WEBKIT_MEDIA_CRYPTO_PPAPI_FFMPEG_CDM_VIDEO_DECODER_H_
-#define WEBKIT_MEDIA_CRYPTO_PPAPI_FFMPEG_CDM_VIDEO_DECODER_H_
+#ifndef WEBKIT_RENDERER_MEDIA_CRYPTO_PPAPI_FFMPEG_CDM_VIDEO_DECODER_H_
+#define WEBKIT_RENDERER_MEDIA_CRYPTO_PPAPI_FFMPEG_CDM_VIDEO_DECODER_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
-#include "webkit/media/crypto/ppapi/cdm/content_decryption_module.h"
-#include "webkit/media/crypto/ppapi/cdm_video_decoder.h"
+#include "webkit/renderer/media/crypto/ppapi/cdm/content_decryption_module.h"
+#include "webkit/renderer/media/crypto/ppapi/cdm_video_decoder.h"
 
 struct AVCodecContext;
 struct AVFrame;
@@ -55,4 +55,4 @@ class FFmpegCdmVideoDecoder : public CdmVideoDecoder {
 
 }  // namespace webkit_media
 
-#endif  // WEBKIT_MEDIA_CRYPTO_PPAPI_FFMPEG_CDM_VIDEO_DECODER_H_
+#endif  // WEBKIT_RENDERER_MEDIA_CRYPTO_PPAPI_FFMPEG_CDM_VIDEO_DECODER_H_
diff --git a/webkit/media/crypto/ppapi/libvpx_cdm_video_decoder.cc b/webkit/renderer/media/crypto/ppapi/libvpx_cdm_video_decoder.cc
index f3acda0..beb365cd 100644
--- a/webkit/media/crypto/ppapi/libvpx_cdm_video_decoder.cc
+++ b/webkit/renderer/media/crypto/ppapi/libvpx_cdm_video_decoder.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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 "webkit/media/crypto/ppapi/libvpx_cdm_video_decoder.h"
+#include "webkit/renderer/media/crypto/ppapi/libvpx_cdm_video_decoder.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ -14,11 +14,11 @@
 // backwards compatibility for legacy applications using the library.
 #define VPX_CODEC_DISABLE_COMPAT 1
 extern "C" {
-#include "third_party/libvpx/source/libvpx/vpx/vpx_decoder.h"
 #include "third_party/libvpx/source/libvpx/vpx/vp8dx.h"
+#include "third_party/libvpx/source/libvpx/vpx/vpx_decoder.h"
 }
 
-#include "webkit/media/crypto/ppapi/cdm/content_decryption_module.h"
+#include "webkit/renderer/media/crypto/ppapi/cdm/content_decryption_module.h"
 
 // Enable USE_COPYPLANE_WITH_LIBVPX to use |CopyPlane()| instead of memcpy to
 // copy video frame data.
diff --git a/webkit/media/crypto/ppapi/libvpx_cdm_video_decoder.h b/webkit/renderer/media/crypto/ppapi/libvpx_cdm_video_decoder.h
index f9d8470..59674b6 100644
--- a/webkit/media/crypto/ppapi/libvpx_cdm_video_decoder.h
+++ b/webkit/renderer/media/crypto/ppapi/libvpx_cdm_video_decoder.h
@@ -1,14 +1,14 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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 WEBKIT_MEDIA_CRYPTO_PPAPI_LIBVPX_CDM_VIDEO_DECODER_H_
-#define WEBKIT_MEDIA_CRYPTO_PPAPI_LIBVPX_CDM_VIDEO_DECODER_H_
+#ifndef WEBKIT_RENDERER_MEDIA_CRYPTO_PPAPI_LIBVPX_CDM_VIDEO_DECODER_H_
+#define WEBKIT_RENDERER_MEDIA_CRYPTO_PPAPI_LIBVPX_CDM_VIDEO_DECODER_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
-#include "webkit/media/crypto/ppapi/cdm/content_decryption_module.h"
-#include "webkit/media/crypto/ppapi/cdm_video_decoder.h"
+#include "webkit/renderer/media/crypto/ppapi/cdm/content_decryption_module.h"
+#include "webkit/renderer/media/crypto/ppapi/cdm_video_decoder.h"
 
 struct vpx_codec_ctx;
 struct vpx_image;
@@ -52,4 +52,4 @@ class LibvpxCdmVideoDecoder : public CdmVideoDecoder {
 
 }  // namespace webkit_media
 
-#endif  // WEBKIT_MEDIA_CRYPTO_PPAPI_LIBVPX_CDM_VIDEO_DECODER_H_
+#endif  // WEBKIT_RENDERER_MEDIA_CRYPTO_PPAPI_LIBVPX_CDM_VIDEO_DECODER_H_
diff --git a/webkit/media/crypto/ppapi/linked_ptr.h b/webkit/renderer/media/crypto/ppapi/linked_ptr.h
index 90f3507..5dd61fe 100644
--- a/webkit/media/crypto/ppapi/linked_ptr.h
+++ b/webkit/renderer/media/crypto/ppapi/linked_ptr.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright 2013 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.
 //
@@ -37,8 +37,8 @@
 //  - is thread safe for copying and deletion
 //  - supports weak_ptrs
 
-#ifndef WEBKIT_MEDIA_CRYPTO_PPAPI_LINKED_PTR_H_
-#define WEBKIT_MEDIA_CRYPTO_PPAPI_LINKED_PTR_H_
+#ifndef WEBKIT_RENDERER_MEDIA_CRYPTO_PPAPI_LINKED_PTR_H_
+#define WEBKIT_RENDERER_MEDIA_CRYPTO_PPAPI_LINKED_PTR_H_
 
 #include "ppapi/cpp/logging.h"
 
@@ -182,4 +182,4 @@ linked_ptr<T> make_linked_ptr(T* ptr) {
   return linked_ptr<T>(ptr);
 }
 
-#endif  // WEBKIT_MEDIA_CRYPTO_PPAPI_LINKED_PTR_H_
+#endif  // WEBKIT_RENDERER_MEDIA_CRYPTO_PPAPI_LINKED_PTR_H_
diff --git a/webkit/media/crypto/ppapi_decryptor.cc b/webkit/renderer/media/crypto/ppapi_decryptor.cc
index 7777a66..93440f3 100644
--- a/webkit/media/crypto/ppapi_decryptor.cc
+++ b/webkit/renderer/media/crypto/ppapi_decryptor.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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 "webkit/media/crypto/ppapi_decryptor.h"
+#include "webkit/renderer/media/crypto/ppapi_decryptor.h"
 
 #include <string>
 
@@ -17,9 +17,9 @@
 #include "media/base/decoder_buffer.h"
 #include "media/base/video_decoder_config.h"
 #include "media/base/video_frame.h"
-#include "webkit/media/crypto/key_systems.h"
 #include "webkit/plugins/ppapi/content_decryptor_delegate.h"
 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
+#include "webkit/renderer/media/crypto/key_systems.h"
 
 namespace webkit_media {
 
diff --git a/webkit/media/crypto/ppapi_decryptor.h b/webkit/renderer/media/crypto/ppapi_decryptor.h
index 0827732..dd47cc7 100644
--- a/webkit/media/crypto/ppapi_decryptor.h
+++ b/webkit/renderer/media/crypto/ppapi_decryptor.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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 WEBKIT_MEDIA_CRYPTO_PPAPI_DECRYPTOR_H_
-#define WEBKIT_MEDIA_CRYPTO_PPAPI_DECRYPTOR_H_
+#ifndef WEBKIT_RENDERER_MEDIA_CRYPTO_PPAPI_DECRYPTOR_H_
+#define WEBKIT_RENDERER_MEDIA_CRYPTO_PPAPI_DECRYPTOR_H_
 
 #include <string>
 
@@ -121,4 +121,4 @@ class PpapiDecryptor : public media::MediaKeys, public media::Decryptor {
 
 }  // namespace webkit_media
 
-#endif  // WEBKIT_MEDIA_CRYPTO_PPAPI_DECRYPTOR_H_
+#endif  // WEBKIT_RENDERER_MEDIA_CRYPTO_PPAPI_DECRYPTOR_H_
diff --git a/webkit/media/crypto/proxy_decryptor.cc b/webkit/renderer/media/crypto/proxy_decryptor.cc
index c542945..87a75ab 100644
--- a/webkit/media/crypto/proxy_decryptor.cc
+++ b/webkit/renderer/media/crypto/proxy_decryptor.cc
@@ -1,20 +1,20 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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 "webkit/media/crypto/proxy_decryptor.h"
+#include "webkit/renderer/media/crypto/proxy_decryptor.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/logging.h"
 #include "media/crypto/aes_decryptor.h"
-#include "webkit/media/crypto/key_systems.h"
+#include "webkit/renderer/media/crypto/key_systems.h"
 
 #if defined(ENABLE_PEPPER_CDMS)
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayerClient.h"
-#include "webkit/media/crypto/ppapi_decryptor.h"
+#include "webkit/renderer/media/crypto/ppapi_decryptor.h"
 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
 #include "webkit/plugins/ppapi/ppapi_webplugin_impl.h"
 #endif  // defined(ENABLE_PEPPER_CDMS)
diff --git a/webkit/media/crypto/proxy_decryptor.h b/webkit/renderer/media/crypto/proxy_decryptor.h
index df498f9..1580099 100644
--- a/webkit/media/crypto/proxy_decryptor.h
+++ b/webkit/renderer/media/crypto/proxy_decryptor.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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 WEBKIT_MEDIA_CRYPTO_PROXY_DECRYPTOR_H_
-#define WEBKIT_MEDIA_CRYPTO_PROXY_DECRYPTOR_H_
+#ifndef WEBKIT_RENDERER_MEDIA_CRYPTO_PROXY_DECRYPTOR_H_
+#define WEBKIT_RENDERER_MEDIA_CRYPTO_PROXY_DECRYPTOR_H_
 
 #include <string>
 
@@ -104,4 +104,4 @@ class ProxyDecryptor : public media::MediaKeys {
 
 }  // namespace webkit_media
 
-#endif  // WEBKIT_MEDIA_CRYPTO_PROXY_DECRYPTOR_H_
+#endif  // WEBKIT_RENDERER_MEDIA_CRYPTO_PROXY_DECRYPTOR_H_
diff --git a/webkit/media/media_stream_audio_renderer.cc b/webkit/renderer/media/media_stream_audio_renderer.cc
index 9feb538..1ffc982 100644
--- a/webkit/media/media_stream_audio_renderer.cc
+++ b/webkit/renderer/media/media_stream_audio_renderer.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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 "webkit/media/media_stream_audio_renderer.h"
+#include "webkit/renderer/media/media_stream_audio_renderer.h"
 
 namespace webkit_media {
 
diff --git a/webkit/media/media_stream_audio_renderer.h b/webkit/renderer/media/media_stream_audio_renderer.h
index 1efda80..3d78d96 100644
--- a/webkit/media/media_stream_audio_renderer.h
+++ b/webkit/renderer/media/media_stream_audio_renderer.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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 WEBKIT_MEDIA_MEDIA_STREAM_AUDIO_RENDERER_H_
-#define WEBKIT_MEDIA_MEDIA_STREAM_AUDIO_RENDERER_H_
+#ifndef WEBKIT_RENDERER_MEDIA_MEDIA_STREAM_AUDIO_RENDERER_H_
+#define WEBKIT_RENDERER_MEDIA_MEDIA_STREAM_AUDIO_RENDERER_H_
 
 #include "base/memory/ref_counted.h"
 #include "base/time.h"
@@ -49,4 +49,4 @@ class MediaStreamAudioRenderer
 
 }  // namespace webkit_media
 
-#endif  // WEBKIT_MEDIA_MEDIA_STREAM_AUDIO_RENDERER_H_
+#endif  // WEBKIT_RENDERER_MEDIA_MEDIA_STREAM_AUDIO_RENDERER_H_
diff --git a/webkit/media/media_stream_client.h b/webkit/renderer/media/media_stream_client.h
index 23a5ada..97a19d7 100644
--- a/webkit/media/media_stream_client.h
+++ b/webkit/renderer/media/media_stream_client.h
@@ -1,13 +1,13 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright 2013 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 WEBKIT_MEDIA_MEDIA_STREAM_CLIENT_H_
-#define WEBKIT_MEDIA_MEDIA_STREAM_CLIENT_H_
+#ifndef WEBKIT_RENDERER_MEDIA_MEDIA_STREAM_CLIENT_H_
+#define WEBKIT_RENDERER_MEDIA_MEDIA_STREAM_CLIENT_H_
 
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
-#include "webkit/media/video_frame_provider.h"
+#include "webkit/renderer/media/video_frame_provider.h"
 
 class GURL;
 
@@ -36,4 +36,4 @@ class MediaStreamClient {
 
 }  // namespace webkit_media
 
-#endif  // WEBKIT_MEDIA_MEDIA_STREAM_CLIENT_H_
+#endif  // WEBKIT_RENDERER_MEDIA_MEDIA_STREAM_CLIENT_H_
diff --git a/webkit/media/preload.h b/webkit/renderer/media/preload.h
index ab8143d..ca41308 100644
--- a/webkit/media/preload.h
+++ b/webkit/renderer/media/preload.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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 WEBKIT_MEDIA_PRELOAD_H_
-#define WEBKIT_MEDIA_PRELOAD_H_
+#ifndef WEBKIT_RENDERER_MEDIA_PRELOAD_H_
+#define WEBKIT_RENDERER_MEDIA_PRELOAD_H_
 
 namespace webkit_media {
 
@@ -22,4 +22,4 @@ enum Preload {
 
 }  // namespace webkit_media
 
-#endif  // WEBKIT_MEDIA_PRELOAD_H_
+#endif  // WEBKIT_RENDERER_MEDIA_PRELOAD_H_
diff --git a/webkit/media/simple_video_frame_provider.cc b/webkit/renderer/media/simple_video_frame_provider.cc
index cdca204..3051e18 100644
--- a/webkit/media/simple_video_frame_provider.cc
+++ b/webkit/renderer/media/simple_video_frame_provider.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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 "webkit/media/simple_video_frame_provider.h"
+#include "webkit/renderer/media/simple_video_frame_provider.h"
 
 #include "base/bind.h"
 #include "base/location.h"
diff --git a/webkit/media/simple_video_frame_provider.h b/webkit/renderer/media/simple_video_frame_provider.h
index df67e93..ea0ca9c 100644
--- a/webkit/media/simple_video_frame_provider.h
+++ b/webkit/renderer/media/simple_video_frame_provider.h
@@ -1,13 +1,13 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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 WEBKIT_MEDIA_SIMPLE_VIDEO_FRAME_PROVIDER_H_
-#define WEBKIT_MEDIA_SIMPLE_VIDEO_FRAME_PROVIDER_H_
+#ifndef WEBKIT_RENDERER_MEDIA_SIMPLE_VIDEO_FRAME_PROVIDER_H_
+#define WEBKIT_RENDERER_MEDIA_SIMPLE_VIDEO_FRAME_PROVIDER_H_
 
 #include "base/time.h"
 #include "ui/gfx/size.h"
-#include "webkit/media/video_frame_provider.h"
+#include "webkit/renderer/media/video_frame_provider.h"
 
 namespace base {
 class MessageLoopProxy;
@@ -60,4 +60,4 @@ class SimpleVideoFrameProvider : public VideoFrameProvider {
 
 }  // namespace webkit_media
 
-#endif  // WEBKIT_MEDIA_SIMPLE_VIDEO_FRAME_PROVIDER_H_
+#endif  // WEBKIT_RENDERER_MEDIA_SIMPLE_VIDEO_FRAME_PROVIDER_H_
diff --git a/webkit/media/test_response_generator.cc b/webkit/renderer/media/test_response_generator.cc
index ae5aeaf2..ab70e6f 100644
--- a/webkit/media/test_response_generator.cc
+++ b/webkit/renderer/media/test_response_generator.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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 "webkit/media/test_response_generator.h"
+#include "webkit/renderer/media/test_response_generator.h"
 
 #include "base/format_macros.h"
 #include "base/stringprintf.h"
diff --git a/webkit/media/test_response_generator.h b/webkit/renderer/media/test_response_generator.h
index 39744b0..cab2076 100644
--- a/webkit/media/test_response_generator.h
+++ b/webkit/renderer/media/test_response_generator.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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 WEBKIT_MEDIA_TEST_RESPONSE_GENERATOR_H_
-#define WEBKIT_MEDIA_TEST_RESPONSE_GENERATOR_H_
+#ifndef WEBKIT_RENDERER_MEDIA_TEST_RESPONSE_GENERATOR_H_
+#define WEBKIT_RENDERER_MEDIA_TEST_RESPONSE_GENERATOR_H_
 
 #include "base/basictypes.h"
 #include "googleurl/src/gurl.h"
@@ -63,4 +63,4 @@ class TestResponseGenerator {
 
 }  // namespace webkit_media
 
-#endif  // WEBKIT_MEDIA_TEST_RESPONSE_GENERATOR_H_
+#endif  // WEBKIT_RENDERER_MEDIA_TEST_RESPONSE_GENERATOR_H_
diff --git a/webkit/media/texttrack_impl.cc b/webkit/renderer/media/texttrack_impl.cc
index 9dbd4ae..ac6a640 100644
--- a/webkit/media/texttrack_impl.cc
+++ b/webkit/renderer/media/texttrack_impl.cc
@@ -1,10 +1,11 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Copyright 2013 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 "webkit/media/texttrack_impl.h"
+#include "webkit/renderer/media/texttrack_impl.h"
+
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInbandTextTrackClient.h"
-#include "webkit/media/webinbandtexttrack_impl.h"
+#include "webkit/renderer/media/webinbandtexttrack_impl.h"
 
 namespace webkit_media {
 
diff --git a/webkit/media/texttrack_impl.h b/webkit/renderer/media/texttrack_impl.h
index 507c8ab..da256cc 100644
--- a/webkit/media/texttrack_impl.h
+++ b/webkit/renderer/media/texttrack_impl.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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 WEBKIT_MEDIA_TEXTTRACK_IMPL_H_
-#define WEBKIT_MEDIA_TEXTTRACK_IMPL_H_
+#ifndef WEBKIT_RENDERER_MEDIA_TEXTTRACK_IMPL_H_
+#define WEBKIT_RENDERER_MEDIA_TEXTTRACK_IMPL_H_
 
 #include <string>
 
@@ -33,5 +33,5 @@ class TextTrackImpl : public media::TextTrack {
 
 }  // namespace webkit_media
 
-#endif  // WEBKIT_MEDIA_TEXTTRACK_IMPL_H_
+#endif  // WEBKIT_RENDERER_MEDIA_TEXTTRACK_IMPL_H_
 
diff --git a/webkit/media/video_frame_provider.cc b/webkit/renderer/media/video_frame_provider.cc
index 40818f2..5e8a9af 100644
--- a/webkit/media/video_frame_provider.cc
+++ b/webkit/renderer/media/video_frame_provider.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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 "webkit/media/video_frame_provider.h"
+#include "webkit/renderer/media/video_frame_provider.h"
 
 namespace webkit_media {
 
diff --git a/webkit/media/video_frame_provider.h b/webkit/renderer/media/video_frame_provider.h
index f6a15cb..8882eb1 100644
--- a/webkit/media/video_frame_provider.h
+++ b/webkit/renderer/media/video_frame_provider.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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 WEBKIT_MEDIA_VIDEO_FRAME_PROVIDER_H_
-#define WEBKIT_MEDIA_VIDEO_FRAME_PROVIDER_H_
+#ifndef WEBKIT_RENDERER_MEDIA_VIDEO_FRAME_PROVIDER_H_
+#define WEBKIT_RENDERER_MEDIA_VIDEO_FRAME_PROVIDER_H_
 
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
@@ -47,4 +47,4 @@ class VideoFrameProvider
 
 }  // namespace webkit_media
 
-#endif  // WEBKIT_MEDIA_VIDEO_FRAME_PROVIDER_H_
+#endif  // WEBKIT_RENDERER_MEDIA_VIDEO_FRAME_PROVIDER_H_
diff --git a/webkit/media/webaudiosourceprovider_impl.cc b/webkit/renderer/media/webaudiosourceprovider_impl.cc
index 874f1f6..44fd63b 100644
--- a/webkit/media/webaudiosourceprovider_impl.cc
+++ b/webkit/renderer/media/webaudiosourceprovider_impl.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Copyright 2013 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 "webkit/media/webaudiosourceprovider_impl.h"
+#include "webkit/renderer/media/webaudiosourceprovider_impl.h"
 
 #include <vector>
 
diff --git a/webkit/media/webaudiosourceprovider_impl.h b/webkit/renderer/media/webaudiosourceprovider_impl.h
index 0295011..242c8d7 100644
--- a/webkit/media/webaudiosourceprovider_impl.h
+++ b/webkit/renderer/media/webaudiosourceprovider_impl.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Copyright 2013 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 WEBKIT_MEDIA_WEBAUDIOSOURCEPROVIDER_IMPL_H_
-#define WEBKIT_MEDIA_WEBAUDIOSOURCEPROVIDER_IMPL_H_
+#ifndef WEBKIT_RENDERER_MEDIA_WEBAUDIOSOURCEPROVIDER_IMPL_H_
+#define WEBKIT_RENDERER_MEDIA_WEBAUDIOSOURCEPROVIDER_IMPL_H_
 
 #include "base/synchronization/lock.h"
 #include "media/base/audio_renderer_sink.h"
@@ -75,4 +75,4 @@ class WebAudioSourceProviderImpl
 
 }  // namespace webkit_media
 
-#endif  // WEBKIT_MEDIA_WEBAUDIOSOURCEPROVIDER_IMPL_H_
+#endif  // WEBKIT_RENDERER_MEDIA_WEBAUDIOSOURCEPROVIDER_IMPL_H_
diff --git a/webkit/media/webaudiosourceprovider_impl_unittest.cc b/webkit/renderer/media/webaudiosourceprovider_impl_unittest.cc
index 12a9a6c..1ad5d51 100644
--- a/webkit/media/webaudiosourceprovider_impl_unittest.cc
+++ b/webkit/renderer/media/webaudiosourceprovider_impl_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Copyright 2013 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.
 
@@ -8,7 +8,7 @@
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebAudioSourceProviderClient.h"
-#include "webkit/media/webaudiosourceprovider_impl.h"
+#include "webkit/renderer/media/webaudiosourceprovider_impl.h"
 
 namespace webkit_media {
 
diff --git a/webkit/media/webinbandtexttrack_impl.cc b/webkit/renderer/media/webinbandtexttrack_impl.cc
index ed64200..b6fa232 100644
--- a/webkit/media/webinbandtexttrack_impl.cc
+++ b/webkit/renderer/media/webinbandtexttrack_impl.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Copyright 2013 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 "webkit/media/webinbandtexttrack_impl.h"
+#include "webkit/renderer/media/webinbandtexttrack_impl.h"
 
 #include "base/logging.h"
 
diff --git a/webkit/media/webinbandtexttrack_impl.h b/webkit/renderer/media/webinbandtexttrack_impl.h
index b6b191b..db4eb7a 100644
--- a/webkit/media/webinbandtexttrack_impl.h
+++ b/webkit/renderer/media/webinbandtexttrack_impl.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Copyright 2013 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 WEBKIT_MEDIA_WEBINANDTEXTTRACK_IMPL_H_
-#define WEBKIT_MEDIA_WEBINANDTEXTTRACK_IMPL_H_
+#ifndef WEBKIT_RENDERER_MEDIA_WEBINBANDTEXTTRACK_IMPL_H_
+#define WEBKIT_RENDERER_MEDIA_WEBINBANDTEXTTRACK_IMPL_H_
 
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInbandTextTrack.h"
@@ -45,4 +45,4 @@ class WebInbandTextTrackImpl : public WebKit::WebInbandTextTrack {
 
 }  // namespace webkit_media
 
-#endif  // WEBKIT_MEDIA_WEBINANDTEXTTRACK_IMPL_H_
+#endif  // WEBKIT_RENDERER_MEDIA_WEBINBANDTEXTTRACK_IMPL_H_
diff --git a/webkit/media/webkit_media.gypi b/webkit/renderer/media/webkit_media.gypi
index 448bec2..07dff10 100644
--- a/webkit/media/webkit_media.gypi
+++ b/webkit/renderer/media/webkit_media.gypi
@@ -1,4 +1,4 @@
-# Copyright (c) 2012 The Chromium Authors. All rights reserved.
+# Copyright 2013 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.
 
diff --git a/webkit/media/webmediaplayer_delegate.h b/webkit/renderer/media/webmediaplayer_delegate.h
index 7f5e4ee..32bd9e4 100644
--- a/webkit/media/webmediaplayer_delegate.h
+++ b/webkit/renderer/media/webmediaplayer_delegate.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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 WEBKIT_MEDIA_WEBMEDIAPLAYER_DELEGATE_H_
-#define WEBKIT_MEDIA_WEBMEDIAPLAYER_DELEGATE_H_
+#ifndef WEBKIT_RENDERER_MEDIA_WEBMEDIAPLAYER_DELEGATE_H_
+#define WEBKIT_RENDERER_MEDIA_WEBMEDIAPLAYER_DELEGATE_H_
 
 namespace WebKit {
 class WebMediaPlayer;
@@ -31,4 +31,4 @@ class WebMediaPlayerDelegate {
 
 }  // namespace webkit_media
 
-#endif  // WEBKIT_MEDIA_WEBMEDIAPLAYER_DELEGATE_H_
+#endif  // WEBKIT_RENDERER_MEDIA_WEBMEDIAPLAYER_DELEGATE_H_
diff --git a/webkit/media/webmediaplayer_impl.cc b/webkit/renderer/media/webmediaplayer_impl.cc
index f489ce4..d277105 100644
--- a/webkit/media/webmediaplayer_impl.cc
+++ b/webkit/renderer/media/webmediaplayer_impl.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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 "webkit/media/webmediaplayer_impl.h"
+#include "webkit/renderer/media/webmediaplayer_impl.h"
 
 #include <algorithm>
 #include <limits>
@@ -43,16 +43,16 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
 #include "v8/include/v8.h"
-#include "webkit/media/buffered_data_source.h"
-#include "webkit/media/texttrack_impl.h"
-#include "webkit/media/webaudiosourceprovider_impl.h"
-#include "webkit/media/webinbandtexttrack_impl.h"
-#include "webkit/media/webmediaplayer_delegate.h"
-#include "webkit/media/webmediaplayer_params.h"
-#include "webkit/media/webmediaplayer_util.h"
-#include "webkit/media/webmediasourceclient_impl.h"
 #include "webkit/plugins/ppapi/ppapi_webplugin_impl.h"
 #include "webkit/renderer/compositor_bindings/web_layer_impl.h"
+#include "webkit/renderer/media/buffered_data_source.h"
+#include "webkit/renderer/media/texttrack_impl.h"
+#include "webkit/renderer/media/webaudiosourceprovider_impl.h"
+#include "webkit/renderer/media/webinbandtexttrack_impl.h"
+#include "webkit/renderer/media/webmediaplayer_delegate.h"
+#include "webkit/renderer/media/webmediaplayer_params.h"
+#include "webkit/renderer/media/webmediaplayer_util.h"
+#include "webkit/renderer/media/webmediasourceclient_impl.h"
 
 using WebKit::WebCanvas;
 using WebKit::WebMediaPlayer;
diff --git a/webkit/media/webmediaplayer_impl.h b/webkit/renderer/media/webmediaplayer_impl.h
index a9763f5..04c0fb4 100644
--- a/webkit/media/webmediaplayer_impl.h
+++ b/webkit/renderer/media/webmediaplayer_impl.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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.
 
@@ -17,8 +17,8 @@
 // at destruction of this class we will need to unhook it from destruction event
 // list of the main thread.
 
-#ifndef WEBKIT_MEDIA_WEBMEDIAPLAYER_IMPL_H_
-#define WEBKIT_MEDIA_WEBMEDIAPLAYER_IMPL_H_
+#ifndef WEBKIT_RENDERER_MEDIA_WEBMEDIAPLAYER_IMPL_H_
+#define WEBKIT_RENDERER_MEDIA_WEBMEDIAPLAYER_IMPL_H_
 
 #include <string>
 
@@ -40,8 +40,8 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebAudioSourceProvider.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayer.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayerClient.h"
-#include "webkit/media/crypto/key_systems.h"
-#include "webkit/media/crypto/proxy_decryptor.h"
+#include "webkit/renderer/media/crypto/key_systems.h"
+#include "webkit/renderer/media/crypto/proxy_decryptor.h"
 
 class RenderAudioSourceProvider;
 
@@ -384,4 +384,4 @@ class WebMediaPlayerImpl
 
 }  // namespace webkit_media
 
-#endif  // WEBKIT_MEDIA_WEBMEDIAPLAYER_IMPL_H_
+#endif  // WEBKIT_RENDERER_MEDIA_WEBMEDIAPLAYER_IMPL_H_
diff --git a/webkit/media/webmediaplayer_ms.cc b/webkit/renderer/media/webmediaplayer_ms.cc
index cbd2396..81200f6 100644
--- a/webkit/media/webmediaplayer_ms.cc
+++ b/webkit/renderer/media/webmediaplayer_ms.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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 "webkit/media/webmediaplayer_ms.h"
+#include "webkit/renderer/media/webmediaplayer_ms.h"
 
 #include <limits>
 
@@ -19,12 +19,12 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayerClient.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
-#include "webkit/media/media_stream_audio_renderer.h"
-#include "webkit/media/media_stream_client.h"
-#include "webkit/media/video_frame_provider.h"
-#include "webkit/media/webmediaplayer_delegate.h"
-#include "webkit/media/webmediaplayer_util.h"
 #include "webkit/renderer/compositor_bindings/web_layer_impl.h"
+#include "webkit/renderer/media/media_stream_audio_renderer.h"
+#include "webkit/renderer/media/media_stream_client.h"
+#include "webkit/renderer/media/video_frame_provider.h"
+#include "webkit/renderer/media/webmediaplayer_delegate.h"
+#include "webkit/renderer/media/webmediaplayer_util.h"
 
 using WebKit::WebCanvas;
 using WebKit::WebMediaPlayer;
diff --git a/webkit/media/webmediaplayer_ms.h b/webkit/renderer/media/webmediaplayer_ms.h
index 580dff9..a44e800 100644
--- a/webkit/media/webmediaplayer_ms.h
+++ b/webkit/renderer/media/webmediaplayer_ms.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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 WEBKIT_MEDIA_WEBMEDIAPLAYER_MS_H_
-#define WEBKIT_MEDIA_WEBMEDIAPLAYER_MS_H_
+#ifndef WEBKIT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_H_
+#define WEBKIT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_H_
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
@@ -199,4 +199,4 @@ class WebMediaPlayerMS
 
 }  // namespace webkit_media
 
-#endif  // WEBKIT_MEDIA_WEBMEDIAPLAYER_MS_H_
+#endif  // WEBKIT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_H_
diff --git a/webkit/media/webmediaplayer_params.cc b/webkit/renderer/media/webmediaplayer_params.cc
index 6f013b6..d33c12b 100644
--- a/webkit/media/webmediaplayer_params.cc
+++ b/webkit/renderer/media/webmediaplayer_params.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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 "webkit/media/webmediaplayer_params.h"
+#include "webkit/renderer/media/webmediaplayer_params.h"
 
 #include "media/base/audio_renderer_sink.h"
 #include "media/base/media_log.h"
diff --git a/webkit/media/webmediaplayer_params.h b/webkit/renderer/media/webmediaplayer_params.h
index 5fb2de9..893cae7 100644
--- a/webkit/media/webmediaplayer_params.h
+++ b/webkit/renderer/media/webmediaplayer_params.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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 WEBKIT_MEDIA_WEBMEDIAPLAYER_PARAMS_H_
-#define WEBKIT_MEDIA_WEBMEDIAPLAYER_PARAMS_H_
+#ifndef WEBKIT_RENDERER_MEDIA_WEBMEDIAPLAYER_PARAMS_H_
+#define WEBKIT_RENDERER_MEDIA_WEBMEDIAPLAYER_PARAMS_H_
 
 #include "base/memory/ref_counted.h"
 #include "media/filters/gpu_video_decoder.h"
@@ -49,4 +49,4 @@ class WebMediaPlayerParams {
 
 }  // namespace media
 
-#endif  // WEBKIT_MEDIA_WEBMEDIAPLAYER_PARAMS_H_
+#endif  // WEBKIT_RENDERER_MEDIA_WEBMEDIAPLAYER_PARAMS_H_
diff --git a/webkit/media/webmediaplayer_util.cc b/webkit/renderer/media/webmediaplayer_util.cc
index 49aa482..c2d3c0a 100644
--- a/webkit/media/webmediaplayer_util.cc
+++ b/webkit/renderer/media/webmediaplayer_util.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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 "webkit/media/webmediaplayer_util.h"
+#include "webkit/renderer/media/webmediaplayer_util.h"
 
 #include <math.h>
 
diff --git a/webkit/media/webmediaplayer_util.h b/webkit/renderer/media/webmediaplayer_util.h
index 0bd645e..1b63acf 100644
--- a/webkit/media/webmediaplayer_util.h
+++ b/webkit/renderer/media/webmediaplayer_util.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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 WEBKIT_MEDIA_WEBMEDIAPLAYER_UTIL_H_
-#define WEBKIT_MEDIA_WEBMEDIAPLAYER_UTIL_H_
+#ifndef WEBKIT_RENDERER_MEDIA_WEBMEDIAPLAYER_UTIL_H_
+#define WEBKIT_RENDERER_MEDIA_WEBMEDIAPLAYER_UTIL_H_
 
 #include "base/time.h"
 #include "media/base/pipeline_status.h"
@@ -27,4 +27,4 @@ WebKit::WebMediaPlayer::NetworkState PipelineErrorToNetworkState(
 
 }  // namespace webkit_media
 
-#endif  // WEBKIT_MEDIA_WEBMEDIAPLAYER_UTIL_H_
+#endif  // WEBKIT_RENDERER_MEDIA_WEBMEDIAPLAYER_UTIL_H_
diff --git a/webkit/media/webmediasourceclient_impl.cc b/webkit/renderer/media/webmediasourceclient_impl.cc
index d53ddb1..16d91e2 100644
--- a/webkit/media/webmediasourceclient_impl.cc
+++ b/webkit/renderer/media/webmediasourceclient_impl.cc
@@ -1,14 +1,14 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Copyright 2013 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 "webkit/media/webmediasourceclient_impl.h"
+#include "webkit/renderer/media/webmediasourceclient_impl.h"
 
 #include "base/guid.h"
 #include "media/filters/chunk_demuxer.h"
 #include "third_party/WebKit/public/platform/WebCString.h"
 #include "third_party/WebKit/public/platform/WebString.h"
-#include "webkit/media/websourcebuffer_impl.h"
+#include "webkit/renderer/media/websourcebuffer_impl.h"
 
 using ::WebKit::WebString;
 using ::WebKit::WebMediaSourceClient;
diff --git a/webkit/media/webmediasourceclient_impl.h b/webkit/renderer/media/webmediasourceclient_impl.h
index 3dad1dc..181634e 100644
--- a/webkit/media/webmediasourceclient_impl.h
+++ b/webkit/renderer/media/webmediasourceclient_impl.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Copyright 2013 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 WEBKIT_MEDIA_WEBMEDIASOURCECLIENT_IMPL_H_
-#define WEBKIT_MEDIA_WEBMEDIASOURCECLIENT_IMPL_H_
+#ifndef WEBKIT_RENDERER_MEDIA_WEBMEDIASOURCECLIENT_IMPL_H_
+#define WEBKIT_RENDERER_MEDIA_WEBMEDIASOURCECLIENT_IMPL_H_
 
 #include <string>
 #include <vector>
@@ -40,4 +40,4 @@ class WebMediaSourceClientImpl : public WebKit::WebMediaSourceClient {
 
 }  // namespace webkit_media
 
-#endif  // WEBKIT_MEDIA_WEBMEDIASOURCECLIENT_IMPL_H_
+#endif  // WEBKIT_RENDERER_MEDIA_WEBMEDIASOURCECLIENT_IMPL_H_
diff --git a/webkit/media/websourcebuffer_impl.cc b/webkit/renderer/media/websourcebuffer_impl.cc
index 5e1bf0b..64784db 100644
--- a/webkit/media/websourcebuffer_impl.cc
+++ b/webkit/renderer/media/websourcebuffer_impl.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Copyright 2013 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 "webkit/media/websourcebuffer_impl.h"
+#include "webkit/renderer/media/websourcebuffer_impl.h"
 
 #include "media/filters/chunk_demuxer.h"
 
diff --git a/webkit/media/websourcebuffer_impl.h b/webkit/renderer/media/websourcebuffer_impl.h
index 6d8bd85..88e6579 100644
--- a/webkit/media/websourcebuffer_impl.h
+++ b/webkit/renderer/media/websourcebuffer_impl.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Copyright 2013 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 WEBKIT_MEDIA_WEBSOURCEBUFFER_IMPL_H_
-#define WEBKIT_MEDIA_WEBSOURCEBUFFER_IMPL_H_
+#ifndef WEBKIT_RENDERER_MEDIA_WEBSOURCEBUFFER_IMPL_H_
+#define WEBKIT_RENDERER_MEDIA_WEBSOURCEBUFFER_IMPL_H_
 
 #include <string>
 
@@ -38,4 +38,4 @@ class WebSourceBufferImpl : public WebKit::WebSourceBuffer {
 
 }  // namespace webkit_media
 
-#endif  // WEBKIT_MEDIA_WEBSOURCEBUFFER_IMPL_H_
+#endif  // WEBKIT_RENDERER_MEDIA_WEBSOURCEBUFFER_IMPL_H_
diff --git a/webkit/support/test_media_stream_client.cc b/webkit/support/test_media_stream_client.cc
index 23166f4..16a87d2 100644
--- a/webkit/support/test_media_stream_client.cc
+++ b/webkit/support/test_media_stream_client.cc
@@ -10,8 +10,8 @@
 #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h"
 #include "third_party/WebKit/public/platform/WebVector.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaStreamRegistry.h"
-#include "webkit/media/media_stream_audio_renderer.h"
-#include "webkit/media/simple_video_frame_provider.h"
+#include "webkit/renderer/media/media_stream_audio_renderer.h"
+#include "webkit/renderer/media/simple_video_frame_provider.h"
 
 using namespace WebKit;
 
diff --git a/webkit/support/test_media_stream_client.h b/webkit/support/test_media_stream_client.h
index d231e7c..3c5e8ef 100644
--- a/webkit/support/test_media_stream_client.h
+++ b/webkit/support/test_media_stream_client.h
@@ -15,7 +15,7 @@
 
 #include "base/callback_forward.h"
 #include "third_party/WebKit/public/platform/WebURL.h"
-#include "webkit/media/media_stream_client.h"
+#include "webkit/renderer/media/media_stream_client.h"
 
 namespace webkit_media {
 class MediaStreamAudioRenderer;
diff --git a/webkit/support/test_stream_texture_factory_android.h b/webkit/support/test_stream_texture_factory_android.h
index 53a0576..e959251 100644
--- a/webkit/support/test_stream_texture_factory_android.h
+++ b/webkit/support/test_stream_texture_factory_android.h
@@ -7,7 +7,7 @@
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
-#include "webkit/media/android/stream_texture_factory_android.h"
+#include "webkit/renderer/media/android/stream_texture_factory_android.h"
 
 namespace webkit_support {
 
diff --git a/webkit/support/webkit_support.cc b/webkit/support/webkit_support.cc
index 7de92db..059586c 100644
--- a/webkit/support/webkit_support.cc
+++ b/webkit/support/webkit_support.cc
@@ -61,15 +61,15 @@
 #include "webkit/glue/webkitplatformsupport_impl.h"
 #include "webkit/glue/webthread_impl.h"
 #include "webkit/glue/weburlrequest_extradata_impl.h"
-#include "webkit/media/media_stream_client.h"
-#include "webkit/media/webmediaplayer_impl.h"
-#include "webkit/media/webmediaplayer_ms.h"
-#include "webkit/media/webmediaplayer_params.h"
 #include "webkit/plugins/npapi/plugin_list.h"
 #include "webkit/plugins/npapi/webplugin_impl.h"
 #include "webkit/plugins/npapi/webplugin_page_delegate.h"
 #include "webkit/plugins/webplugininfo.h"
 #include "webkit/renderer/compositor_bindings/web_compositor_support_impl.h"
+#include "webkit/renderer/media/media_stream_client.h"
+#include "webkit/renderer/media/webmediaplayer_impl.h"
+#include "webkit/renderer/media/webmediaplayer_ms.h"
+#include "webkit/renderer/media/webmediaplayer_params.h"
 #include "webkit/support/platform_support.h"
 #include "webkit/support/simple_database_system.h"
 #include "webkit/support/test_webidbfactory.h"
diff --git a/webkit/support/webkit_support.gyp b/webkit/support/webkit_support.gyp
index 75e766d..e2af7b4 100644
--- a/webkit/support/webkit_support.gyp
+++ b/webkit/support/webkit_support.gyp
@@ -16,8 +16,8 @@
         '../appcache/webkit_appcache.gypi',
         '../base/webkit_base.gypi',
         '../glue/webkit_glue.gypi',
-        '../media/webkit_media.gypi',
         '../plugins/webkit_plugins.gypi',
+        '../renderer/media/webkit_media.gypi',
         '../storage/webkit_storage.gypi',
         'webkit_support.gypi',
       ],