Moving media-related files from webkit/glue/ to webkit/media/.

Files under webkit/media/ are now under their very own webkit_media namespace.

Review URL: http://codereview.chromium.org/8570010

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

35 files changed, 216 insertions, 177 deletions

diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi
index 42a1ae3..d93de09 100644
--- a/webkit/glue/webkit_glue.gypi
+++ b/webkit/glue/webkit_glue.gypi
@@ -113,7 +113,6 @@
         '<(DEPTH)/base/base.gyp:base_static',
         '<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl',
         '<(DEPTH)/gpu/gpu.gyp:gles2_implementation',
-        '<(DEPTH)/media/media.gyp:yuv_convert',
         '<(DEPTH)/net/net.gyp:net',
         '<(DEPTH)/ppapi/ppapi.gyp:ppapi_c',
         '<(DEPTH)/ppapi/ppapi_internal.gyp:ppapi_shared',
@@ -320,21 +319,6 @@
         '../plugins/sad_plugin.h',
         '../plugins/webplugininfo.cc',
         '../plugins/webplugininfo.h',
-        'media/audio_decoder.cc',
-        'media/audio_decoder.h',
-        'media/buffered_data_source.cc',
-        'media/buffered_data_source.h',
-        'media/buffered_resource_loader.cc',
-        'media/buffered_resource_loader.h',
-        'media/simple_data_source.cc',
-        'media/simple_data_source.h',
-        'media/video_renderer_impl.cc',
-        'media/video_renderer_impl.h',
-        'media/web_data_source.cc',
-        'media/web_data_source.h',
-        'media/web_data_source_factory.cc',
-        'media/web_data_source_factory.h',
-        'media/web_video_renderer.h',
         'alt_error_page_resource_fetcher.cc',
         'alt_error_page_resource_fetcher.h',
         'context_menu.cc',
@@ -409,11 +393,6 @@
         'webkit_glue.h',
         'webkitplatformsupport_impl.cc',
         'webkitplatformsupport_impl.h',
-        'webmediaplayer_delegate.h',
-        'webmediaplayer_impl.cc',
-        'webmediaplayer_impl.h',
-        'webmediaplayer_proxy.cc',
-        'webmediaplayer_proxy.h',
         'webmenuitem.cc',
         'webmenuitem.h',
         'webmenurunner_mac.h',
@@ -431,8 +410,6 @@
         'webthread_impl.cc',
         'weburlloader_impl.cc',
         'weburlloader_impl.h',
-        'webvideoframe_impl.cc',
-        'webvideoframe_impl.h',
         'web_intent_data.cc',
         'web_intent_data.h',
         'web_intent_reply_data.h',
diff --git a/webkit/glue/webkitplatformsupport_impl.cc b/webkit/glue/webkitplatformsupport_impl.cc
index 4ab1a54..7c0863f 100644
--- a/webkit/glue/webkitplatformsupport_impl.cc
+++ b/webkit/glue/webkitplatformsupport_impl.cc
@@ -37,13 +37,13 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebVector.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h"
-#include "webkit/glue/media/audio_decoder.h"
-#include "webkit/plugins/npapi/plugin_instance.h"
-#include "webkit/plugins/webplugininfo.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/glue/websocketstreamhandle_impl.h"
 #include "webkit/glue/webthread_impl.h"
 #include "webkit/glue/weburlloader_impl.h"
+#include "webkit/media/audio_decoder.h"
+#include "webkit/plugins/npapi/plugin_instance.h"
+#include "webkit/plugins/webplugininfo.h"
 
 #if defined(OS_LINUX)
 #include "v8/include/v8.h"
@@ -450,10 +450,10 @@ WebData WebKitPlatformSupportImpl::loadResource(const char* name) {
 bool WebKitPlatformSupportImpl::loadAudioResource(
     WebKit::WebAudioBus* destination_bus, const char* audio_file_data,
     size_t data_size, double sample_rate) {
-  return DecodeAudioFileData(destination_bus,
-                             audio_file_data,
-                             data_size,
-                             sample_rate);
+  return webkit_media::DecodeAudioFileData(destination_bus,
+                                           audio_file_data,
+                                           data_size,
+                                           sample_rate);
 }
 
 WebString WebKitPlatformSupportImpl::queryLocalizedString(
diff --git a/webkit/glue/media/OWNERS b/webkit/media/OWNERS
index 21a33d5..21a33d5 100644
--- a/webkit/glue/media/OWNERS
+++ b/webkit/media/OWNERS
diff --git a/webkit/glue/media/audio_decoder.cc b/webkit/media/audio_decoder.cc
index 56186fe..f6b79ed 100644
--- a/webkit/glue/media/audio_decoder.cc
+++ b/webkit/media/audio_decoder.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/glue/media/audio_decoder.h"
+#include "webkit/media/audio_decoder.h"
 
 #include <vector>
 #include "base/basictypes.h"
@@ -18,7 +18,7 @@ using media::InMemoryUrlProtocol;
 using std::vector;
 using WebKit::WebAudioBus;
 
-namespace webkit_glue {
+namespace webkit_media {
 
 // Decode in-memory audio file data.
 bool DecodeAudioFileData(
@@ -84,4 +84,4 @@ bool DecodeAudioFileData(
   return reader.Read(audio_data, number_of_frames);
 }
 
-}  // namespace webkit_glue
+}  // namespace webkit_media
diff --git a/webkit/glue/media/audio_decoder.h b/webkit/media/audio_decoder.h
index 57cc90b..aae5581d 100644
--- a/webkit/glue/media/audio_decoder.h
+++ b/webkit/media/audio_decoder.h
@@ -1,20 +1,20 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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_GLUE_MEDIA_AUDIO_DECODER_H_
-#define WEBKIT_GLUE_MEDIA_AUDIO_DECODER_H_
+#ifndef WEBKIT_MEDIA_AUDIO_DECODER_H_
+#define WEBKIT_MEDIA_AUDIO_DECODER_H_
 
 #include "base/basictypes.h"
 
 namespace WebKit { class WebAudioBus; }
 
-namespace webkit_glue {
+namespace webkit_media {
 
 // Decode in-memory audio file data.
 bool DecodeAudioFileData(WebKit::WebAudioBus* destination_bus, const char* data,
                          size_t data_size, double sample_rate);
 
-}  // namespace webkit_glue
+}  // namespace webkit_media
 
-#endif  // WEBKIT_GLUE_MEDIA_AUDIO_DECODER_H_
+#endif  // WEBKIT_MEDIA_AUDIO_DECODER_H_
diff --git a/webkit/glue/media/buffered_data_source.cc b/webkit/media/buffered_data_source.cc
index a3f43cf5..01d4675 100644
--- a/webkit/glue/media/buffered_data_source.cc
+++ b/webkit/media/buffered_data_source.cc
@@ -2,18 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/glue/media/buffered_data_source.h"
+#include "webkit/media/buffered_data_source.h"
 
 #include "base/bind.h"
 #include "media/base/filter_host.h"
 #include "media/base/media_log.h"
 #include "net/base/net_errors.h"
-#include "webkit/glue/media/web_data_source_factory.h"
+#include "webkit/media/web_data_source_factory.h"
 #include "webkit/glue/webkit_glue.h"
 
 using WebKit::WebFrame;
 
-namespace webkit_glue {
+namespace webkit_media {
 
 // BufferedDataSource has an intermediate buffer, this value governs the initial
 // size of that buffer. It is set to 32KB because this is a typical read size
@@ -105,7 +105,7 @@ void BufferedDataSource::Initialize(const std::string& url,
   if (url_.SchemeIs(kDataScheme)) {
     callback.Run(media::DATASOURCE_ERROR_URL_NOT_SUPPORTED);
     return;
-  } else if (!IsProtocolSupportedForMedia(url_)) {
+  } else if (!webkit_glue::IsProtocolSupportedForMedia(url_)) {
     callback.Run(media::PIPELINE_ERROR_NETWORK);
     return;
   }
@@ -669,4 +669,4 @@ void BufferedDataSource::UpdateHostState_Locked() {
   }
 }
 
-}  // namespace webkit_glue
+}  // namespace webkit_media
diff --git a/webkit/glue/media/buffered_data_source.h b/webkit/media/buffered_data_source.h
index b8da78e..7987d09 100644
--- a/webkit/glue/media/buffered_data_source.h
+++ b/webkit/media/buffered_data_source.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_GLUE_MEDIA_BUFFERED_DATA_SOURCE_H_
-#define WEBKIT_GLUE_MEDIA_BUFFERED_DATA_SOURCE_H_
+#ifndef WEBKIT_MEDIA_BUFFERED_DATA_SOURCE_H_
+#define WEBKIT_MEDIA_BUFFERED_DATA_SOURCE_H_
 
 #include <string>
 
@@ -12,13 +12,13 @@
 #include "base/synchronization/lock.h"
 #include "media/base/filter_factories.h"
 #include "media/base/filters.h"
-#include "webkit/glue/media/buffered_resource_loader.h"
+#include "webkit/media/buffered_resource_loader.h"
 
 namespace media {
 class MediaLog;
 }
 
-namespace webkit_glue {
+namespace webkit_media {
 
 // This class may be created on any thread, and is callable from the render
 // thread as well as media-specific threads.
@@ -230,6 +230,6 @@ class BufferedDataSource : public WebDataSource {
   DISALLOW_COPY_AND_ASSIGN(BufferedDataSource);
 };
 
-}  // namespace webkit_glue
+}  // namespace webkit_media
 
-#endif  // WEBKIT_GLUE_MEDIA_BUFFERED_DATA_SOURCE_H_
+#endif  // WEBKIT_MEDIA_BUFFERED_DATA_SOURCE_H_
diff --git a/webkit/glue/media/buffered_data_source_unittest.cc b/webkit/media/buffered_data_source_unittest.cc
index 1e29e2b..f7f7131 100644
--- a/webkit/glue/media/buffered_data_source_unittest.cc
+++ b/webkit/media/buffered_data_source_unittest.cc
@@ -14,7 +14,7 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLResponse.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
-#include "webkit/glue/media/buffered_data_source.h"
+#include "webkit/media/buffered_data_source.h"
 #include "webkit/mocks/mock_webframeclient.h"
 #include "webkit/mocks/mock_weburlloader.h"
 
@@ -40,7 +40,10 @@ using WebKit::WebURLError;
 using WebKit::WebURLResponse;
 using WebKit::WebView;
 
-namespace webkit_glue {
+using webkit_glue::MockWebFrameClient;
+using webkit_glue::MockWebURLLoader;
+
+namespace webkit_media {
 
 static const char* kHttpUrl = "http://test";
 static const char* kFileUrl = "file://test";
@@ -785,4 +788,4 @@ TEST_F(BufferedDataSourceTest2, SetPlaybackRate) {
   StopDataSource();
 }
 
-}  // namespace webkit_glue
+}  // namespace webkit_media
diff --git a/webkit/glue/media/buffered_resource_loader.cc b/webkit/media/buffered_resource_loader.cc
index 457aee2..6a9f031 100644
--- a/webkit/glue/media/buffered_resource_loader.cc
+++ b/webkit/media/buffered_resource_loader.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/glue/media/buffered_resource_loader.h"
+#include "webkit/media/buffered_resource_loader.h"
 
 #include "base/format_macros.h"
 #include "base/stringprintf.h"
@@ -27,7 +27,7 @@ using WebKit::WebURLRequest;
 using WebKit::WebURLResponse;
 using webkit_glue::MultipartResponseDelegate;
 
-namespace webkit_glue {
+namespace webkit_media {
 
 static const int kHttpOK = 200;
 static const int kHttpPartialContent = 206;
@@ -358,7 +358,7 @@ void BufferedResourceLoader::willSendRequest(
   if (single_origin_)
     single_origin_ = url_.GetOrigin() == GURL(newRequest.url()).GetOrigin();
 
-  if (!IsProtocolSupportedForMedia(newRequest.url())) {
+  if (!webkit_glue::IsProtocolSupportedForMedia(newRequest.url())) {
     // Set the url in the request to an invalid value (empty url).
     newRequest.setURL(WebKit::WebURL());
     DoneStart(net::ERR_ADDRESS_INVALID);
@@ -810,4 +810,4 @@ void BufferedResourceLoader::Log() {
   }
 }
 
-}  // namespace webkit_glue
+}  // namespace webkit_media
diff --git a/webkit/glue/media/buffered_resource_loader.h b/webkit/media/buffered_resource_loader.h
index 50e2ae8..e92eb37 100644
--- a/webkit/glue/media/buffered_resource_loader.h
+++ b/webkit/media/buffered_resource_loader.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_GLUE_MEDIA_BUFFERED_RESOURCE_LOADER_H_
-#define WEBKIT_GLUE_MEDIA_BUFFERED_RESOURCE_LOADER_H_
+#ifndef WEBKIT_MEDIA_BUFFERED_RESOURCE_LOADER_H_
+#define WEBKIT_MEDIA_BUFFERED_RESOURCE_LOADER_H_
 
 #include <string>
 
@@ -17,14 +17,14 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLLoader.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLLoaderClient.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLRequest.h"
-#include "webkit/glue/media/web_data_source.h"
-#include "webkit/glue/webmediaplayer_impl.h"
+#include "webkit/media/web_data_source.h"
+#include "webkit/media/webmediaplayer_impl.h"
 
 namespace media {
 class MediaLog;
 }
 
-namespace webkit_glue {
+namespace webkit_media {
 
 const int64 kPositionNotSpecified = -1;
 
@@ -299,6 +299,6 @@ class BufferedResourceLoader
   DISALLOW_COPY_AND_ASSIGN(BufferedResourceLoader);
 };
 
-}  // namespace webkit_glue
+}  // namespace webkit_media
 
-#endif  // WEBKIT_GLUE_MEDIA_BUFFERED_RESOURCE_LOADER_H_
+#endif  // WEBKIT_MEDIA_BUFFERED_RESOURCE_LOADER_H_
diff --git a/webkit/glue/media/buffered_resource_loader_unittest.cc b/webkit/media/buffered_resource_loader_unittest.cc
index d219725..e434dff 100644
--- a/webkit/glue/media/buffered_resource_loader_unittest.cc
+++ b/webkit/media/buffered_resource_loader_unittest.cc
@@ -18,7 +18,7 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLRequest.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLResponse.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
-#include "webkit/glue/media/buffered_resource_loader.h"
+#include "webkit/media/buffered_resource_loader.h"
 #include "webkit/mocks/mock_webframeclient.h"
 #include "webkit/mocks/mock_weburlloader.h"
 
@@ -32,7 +32,10 @@ using WebKit::WebURLError;
 using WebKit::WebURLResponse;
 using WebKit::WebView;
 
-namespace webkit_glue {
+using webkit_glue::MockWebFrameClient;
+using webkit_glue::MockWebURLLoader;
+
+namespace webkit_media {
 
 static const char* kHttpUrl = "http://test";
 static const char kHttpRedirectToSameDomainUrl1[] = "http://test/ing";
@@ -1105,4 +1108,4 @@ TEST_F(BufferedResourceLoaderTest, BufferWindow_PlaybackRate_AboveUpperBound) {
   StopWhenLoad();
 }
 
-}  // namespace webkit_glue
+}  // namespace webkit_media
diff --git a/webkit/glue/media/media_stream_client.h b/webkit/media/media_stream_client.h
index 2f51d91..ab1e767 100644
--- a/webkit/glue/media/media_stream_client.h
+++ b/webkit/media/media_stream_client.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_GLUE_MEDIA_MEDIA_STREAM_CLIENT_H_
-#define WEBKIT_GLUE_MEDIA_MEDIA_STREAM_CLIENT_H_
+#ifndef WEBKIT_MEDIA_MEDIA_STREAM_CLIENT_H_
+#define WEBKIT_MEDIA_MEDIA_STREAM_CLIENT_H_
 
 #include "base/memory/ref_counted.h"
 
@@ -14,7 +14,7 @@ class VideoDecoder;
 class MessageLoopFactory;
 }
 
-namespace webkit_glue {
+namespace webkit_media {
 
 // Define an interface for media stream client to get some information about
 // the media stream.
@@ -28,6 +28,6 @@ class MediaStreamClient {
   virtual ~MediaStreamClient() {}
 };
 
-}  // namespace webkit_glue
+}  // namespace webkit_media
 
-#endif  // WEBKIT_GLUE_MEDIA_MEDIA_STREAM_CLIENT_H_
+#endif  // WEBKIT_MEDIA_MEDIA_STREAM_CLIENT_H_
diff --git a/webkit/glue/media/simple_data_source.cc b/webkit/media/simple_data_source.cc
index 09736a5..18b464a 100644
--- a/webkit/glue/media/simple_data_source.cc
+++ b/webkit/media/simple_data_source.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/glue/media/simple_data_source.h"
+#include "webkit/media/simple_data_source.h"
 
 #include "base/bind.h"
 #include "base/message_loop.h"
@@ -17,13 +17,13 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKitPlatformSupport.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLLoaderOptions.h"
-#include "webkit/glue/media/web_data_source_factory.h"
 #include "webkit/glue/webkit_glue.h"
+#include "webkit/media/web_data_source_factory.h"
 
 using WebKit::WebString;
 using WebKit::WebURLLoaderOptions;
 
-namespace webkit_glue {
+namespace webkit_media {
 
 static const char kDataScheme[] = "data";
 
@@ -96,7 +96,7 @@ void SimpleDataSource::Initialize(
 
     // Validate the URL.
     url_ = GURL(url);
-    if (!url_.is_valid() || !IsProtocolSupportedForMedia(url_)) {
+    if (!url_.is_valid() || !webkit_glue::IsProtocolSupportedForMedia(url_)) {
       DoneInitialization_Locked(false);
       return;
     }
@@ -358,4 +358,4 @@ void SimpleDataSource::UpdateHostState() {
   }
 }
 
-}  // namespace webkit_glue
+}  // namespace webkit_media
diff --git a/webkit/glue/media/simple_data_source.h b/webkit/media/simple_data_source.h
index cea3c35..ca1e78a 100644
--- a/webkit/glue/media/simple_data_source.h
+++ b/webkit/media/simple_data_source.h
@@ -7,8 +7,8 @@
 // Primarily used to test <audio> and <video> with buffering/caching removed
 // from the equation.
 
-#ifndef WEBKIT_GLUE_MEDIA_SIMPLE_DATA_SOURCE_H_
-#define WEBKIT_GLUE_MEDIA_SIMPLE_DATA_SOURCE_H_
+#ifndef WEBKIT_MEDIA_SIMPLE_DATA_SOURCE_H_
+#define WEBKIT_MEDIA_SIMPLE_DATA_SOURCE_H_
 
 #include <algorithm>
 #include <string>
@@ -22,7 +22,7 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLLoaderClient.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLRequest.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLResponse.h"
-#include "webkit/glue/media/web_data_source.h"
+#include "webkit/media/web_data_source.h"
 
 class MessageLoop;
 
@@ -30,7 +30,7 @@ namespace media {
 class MediaLog;
 }
 
-namespace webkit_glue {
+namespace webkit_media {
 
 class SimpleDataSource
     : public WebDataSource,
@@ -148,6 +148,6 @@ class SimpleDataSource
   DISALLOW_COPY_AND_ASSIGN(SimpleDataSource);
 };
 
-}  // namespace webkit_glue
+}  // namespace webkit_media
 
-#endif  // WEBKIT_GLUE_MEDIA_SIMPLE_DATA_SOURCE_H_
+#endif  // WEBKIT_MEDIA_SIMPLE_DATA_SOURCE_H_
diff --git a/webkit/glue/media/simple_data_source_unittest.cc b/webkit/media/simple_data_source_unittest.cc
index cfb5445..62b933c3 100644
--- a/webkit/glue/media/simple_data_source_unittest.cc
+++ b/webkit/media/simple_data_source_unittest.cc
@@ -13,7 +13,7 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLRequest.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLResponse.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
-#include "webkit/glue/media/simple_data_source.h"
+#include "webkit/media/simple_data_source.h"
 #include "webkit/mocks/mock_webframeclient.h"
 #include "webkit/mocks/mock_weburlloader.h"
 
@@ -34,7 +34,10 @@ using WebKit::WebURLRequest;
 using WebKit::WebURLResponse;
 using WebKit::WebView;
 
-namespace webkit_glue {
+using webkit_glue::MockWebFrameClient;
+using webkit_glue::MockWebURLLoader;
+
+namespace webkit_media {
 
 static const int kDataSize = 1024;
 static const char kHttpUrl[] = "http://test";
@@ -281,4 +284,4 @@ TEST_F(SimpleDataSourceTest, HasSingleOrigin) {
   DestroyDataSource();
 }
 
-}  // namespace webkit_glue
+}  // namespace webkit_media
diff --git a/webkit/glue/media/video_renderer_impl.cc b/webkit/media/video_renderer_impl.cc
index b3bf063..955512f 100644
--- a/webkit/glue/media/video_renderer_impl.cc
+++ b/webkit/media/video_renderer_impl.cc
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/glue/media/video_renderer_impl.h"
+#include "webkit/media/video_renderer_impl.h"
 
 #include "base/logging.h"
 #include "media/base/video_frame.h"
 #include "media/base/yuv_convert.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkDevice.h"
-#include "webkit/glue/webmediaplayer_proxy.h"
+#include "webkit/media/webmediaplayer_proxy.h"
 
-namespace webkit_glue {
+namespace webkit_media {
 
 VideoRendererImpl::VideoRendererImpl(bool pts_logging)
     : last_converted_frame_(NULL),
@@ -275,4 +275,4 @@ void VideoRendererImpl::FastPaint(media::VideoFrame* video_frame,
   }
 }
 
-}  // namespace webkit_glue
+}  // namespace webkit_media
diff --git a/webkit/glue/media/video_renderer_impl.h b/webkit/media/video_renderer_impl.h
index c69e085..af67208 100644
--- a/webkit/glue/media/video_renderer_impl.h
+++ b/webkit/media/video_renderer_impl.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_GLUE_MEDIA_VIDEO_RENDERER_IMPL_H_
-#define WEBKIT_GLUE_MEDIA_VIDEO_RENDERER_IMPL_H_
+#ifndef WEBKIT_MEDIA_VIDEO_RENDERER_IMPL_H_
+#define WEBKIT_MEDIA_VIDEO_RENDERER_IMPL_H_
 
 #include "media/base/buffers.h"
 #include "media/base/filters.h"
@@ -11,9 +11,9 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayer.h"
 #include "ui/gfx/size.h"
 #include "third_party/skia/include/core/SkBitmap.h"
-#include "webkit/glue/media/web_video_renderer.h"
+#include "webkit/media/web_video_renderer.h"
 
-namespace webkit_glue {
+namespace webkit_media {
 
 // The video renderer implementation to be use by the media pipeline. It lives
 // inside video renderer thread and also WebKit's main thread. We need to be
@@ -77,6 +77,6 @@ class VideoRendererImpl : public WebVideoRenderer {
   DISALLOW_COPY_AND_ASSIGN(VideoRendererImpl);
 };
 
-}  // namespace webkit_glue
+}  // namespace webkit_media
 
-#endif  // WEBKIT_GLUE_MEDIA_VIDEO_RENDERER_IMPL_H_
+#endif  // WEBKIT_MEDIA_VIDEO_RENDERER_IMPL_H_
diff --git a/webkit/glue/media/web_data_source.cc b/webkit/media/web_data_source.cc
index a46d594..4795caa 100644
--- a/webkit/glue/media/web_data_source.cc
+++ b/webkit/media/web_data_source.cc
@@ -1,11 +1,11 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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 "media/base/filters.h"
-#include "webkit/glue/media/web_data_source.h"
+#include "webkit/media/web_data_source.h"
 
-namespace webkit_glue {
+namespace webkit_media {
 
 WebDataSource::WebDataSource()
     : media::DataSource() {
@@ -14,4 +14,4 @@ WebDataSource::WebDataSource()
 WebDataSource::~WebDataSource() {
 }
 
-}  // namespace webkit_glue
+}  // namespace webkit_media
diff --git a/webkit/glue/media/web_data_source.h b/webkit/media/web_data_source.h
index c972a66..5cb27c4 100644
--- a/webkit/glue/media/web_data_source.h
+++ b/webkit/media/web_data_source.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_GLUE_MEDIA_WEB_DATA_SOURCE_H_
-#define WEBKIT_GLUE_MEDIA_WEB_DATA_SOURCE_H_
+#ifndef WEBKIT_MEDIA_WEB_DATA_SOURCE_H_
+#define WEBKIT_MEDIA_WEB_DATA_SOURCE_H_
 
 #include "base/callback.h"
 #include "media/base/filters.h"
 #include "media/base/pipeline_status.h"
 
-namespace webkit_glue {
+namespace webkit_media {
 
 // An interface that allows WebMediaPlayerImpl::Proxy to communicate with the
 // DataSource in the pipeline.
@@ -54,6 +54,6 @@ class WebDataSource : public media::DataSource {
 // a WebDataSource list or call Abort().
 typedef base::Callback<void(WebDataSource*)> WebDataSourceBuildObserverHack;
 
-}  // namespace webkit_glue
+}  // namespace webkit_media
 
-#endif  // WEBKIT_GLUE_MEDIA_WEB_DATA_SOURCE_H_
+#endif  // WEBKIT_MEDIA_WEB_DATA_SOURCE_H_
diff --git a/webkit/glue/media/web_data_source_factory.cc b/webkit/media/web_data_source_factory.cc
index ba77bb4..4df0dcf 100644
--- a/webkit/glue/media/web_data_source_factory.cc
+++ b/webkit/media/web_data_source_factory.cc
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/glue/media/web_data_source_factory.h"
+#include "webkit/media/web_data_source_factory.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "media/base/media_log.h"
 
-namespace webkit_glue {
+namespace webkit_media {
 
 class WebDataSourceFactory::BuildRequest
     : public media::AsyncDataSourceFactoryBase::BuildRequest {
@@ -107,4 +107,4 @@ void WebDataSourceFactory::BuildRequest::InitDone(
   // RequestComplete().
 }
 
-}  // namespace webkit_glue
+}  // namespace webkit_media
diff --git a/webkit/glue/media/web_data_source_factory.h b/webkit/media/web_data_source_factory.h
index da578b2..2b0dd65 100644
--- a/webkit/glue/media/web_data_source_factory.h
+++ b/webkit/media/web_data_source_factory.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_GLUE_MEDIA_BUFFERED_DATA_SOURCE_FACTORY_H_
-#define WEBKIT_GLUE_MEDIA_BUFFERED_DATA_SOURCE_FACTORY_H_
+#ifndef WEBKIT_MEDIA_BUFFERED_DATA_SOURCE_FACTORY_H_
+#define WEBKIT_MEDIA_BUFFERED_DATA_SOURCE_FACTORY_H_
 
 #include "base/memory/ref_counted.h"
 #include "media/base/async_filter_factory_base.h"
-#include "webkit/glue/media/web_data_source.h"
+#include "webkit/media/web_data_source.h"
 
 class MessageLoop;
 
@@ -19,7 +19,7 @@ namespace WebKit {
 class WebFrame;
 }
 
-namespace webkit_glue {
+namespace webkit_media {
 
 class WebDataSourceFactory : public media::AsyncDataSourceFactoryBase {
  public:
@@ -54,6 +54,6 @@ class WebDataSourceFactory : public media::AsyncDataSourceFactoryBase {
   DISALLOW_COPY_AND_ASSIGN(WebDataSourceFactory);
 };
 
-}  // namespace webkit_glue
+}  // namespace webkit_media
 
-#endif  // WEBKIT_GLUE_MEDIA_BUFFERED_DATA_SOURCE_FACTORY_H_
+#endif  // WEBKIT_MEDIA_BUFFERED_DATA_SOURCE_FACTORY_H_
diff --git a/webkit/glue/media/web_video_renderer.h b/webkit/media/web_video_renderer.h
index c2762e1..a1770fd 100644
--- a/webkit/glue/media/web_video_renderer.h
+++ b/webkit/media/web_video_renderer.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_GLUE_MEDIA_WEB_VIDEO_RENDERER_H_
-#define WEBKIT_GLUE_MEDIA_WEB_VIDEO_RENDERER_H_
+#ifndef WEBKIT_MEDIA_WEB_VIDEO_RENDERER_H_
+#define WEBKIT_MEDIA_WEB_VIDEO_RENDERER_H_
 
 #include "media/base/video_frame.h"
 #include "media/filters/video_renderer_base.h"
@@ -11,7 +11,7 @@
 
 class SkCanvas;
 
-namespace webkit_glue {
+namespace webkit_media {
 
 class WebMediaPlayerProxy;
 
@@ -42,6 +42,6 @@ class WebVideoRenderer : public media::VideoRendererBase {
   DISALLOW_COPY_AND_ASSIGN(WebVideoRenderer);
 };
 
-}  // namespace webkit_glue
+}  // namespace webkit_media
 
-#endif  // WEBKIT_GLUE_MEDIA_WEB_VIDEO_RENDERER_H_
+#endif  // WEBKIT_MEDIA_WEB_VIDEO_RENDERER_H_
diff --git a/webkit/media/webkit_media.gypi b/webkit/media/webkit_media.gypi
new file mode 100644
index 0000000..38327d8
--- /dev/null
+++ b/webkit/media/webkit_media.gypi
@@ -0,0 +1,50 @@
+# Copyright (c) 2011 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.
+
+{
+  'targets': [
+    {
+      'target_name': 'webkit_media',
+      'type': 'static_library',
+      'variables': { 'enable_wexit_time_destructors': 1, },
+      'dependencies': [
+        '<(DEPTH)/base/base.gyp:base',
+        '<(DEPTH)/media/media.gyp:yuv_convert',
+        '<(DEPTH)/skia/skia.gyp:skia',
+      ],
+      'sources': [
+        'audio_decoder.cc',
+        'audio_decoder.h',
+        'buffered_data_source.cc',
+        'buffered_data_source.h',
+        'buffered_resource_loader.cc',
+        'buffered_resource_loader.h',
+        'media_stream_client.h',
+        'simple_data_source.cc',
+        'simple_data_source.h',
+        'video_renderer_impl.cc',
+        'video_renderer_impl.h',
+        'web_data_source.cc',
+        'web_data_source_factory.cc',
+        'web_data_source_factory.h',
+        'web_data_source.h',
+        'web_video_renderer.h',
+        'webmediaplayer_delegate.h',
+        'webmediaplayer_impl.cc',
+        'webmediaplayer_impl.h',
+        'webmediaplayer_proxy.cc',
+        'webmediaplayer_proxy.h',
+        'webvideoframe_impl.cc',
+        'webvideoframe_impl.h',
+      ],
+      'conditions': [
+        ['inside_chromium_build==0', {
+          'dependencies': [
+            '<(DEPTH)/webkit/support/setup_third_party.gyp:third_party_headers',
+          ],
+        }],
+      ],
+    },
+  ],
+}
diff --git a/webkit/glue/webmediaplayer_delegate.h b/webkit/media/webmediaplayer_delegate.h
index bec39b0..7fa3409 100644
--- a/webkit/glue/webmediaplayer_delegate.h
+++ b/webkit/media/webmediaplayer_delegate.h
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_GLUE_WEBMEDIAPLAYER_DELEGATE_H_
-#define WEBKIT_GLUE_WEBMEDIAPLAYER_DELEGATE_H_
+#ifndef WEBKIT_MEDIA_WEBMEDIAPLAYER_DELEGATE_H_
+#define WEBKIT_MEDIA_WEBMEDIAPLAYER_DELEGATE_H_
 
-namespace webkit_glue {
+namespace webkit_media {
 
 class WebMediaPlayerImpl;
 
@@ -26,6 +26,6 @@ class WebMediaPlayerDelegate {
   virtual void PlayerGone(WebMediaPlayerImpl* player) {}
 };
 
-}  // namespace webkit_glue
+}  // namespace webkit_media
 
-#endif  // WEBKIT_GLUE_WEBMEDIAPLAYER_DELEGATE_H_
+#endif  // WEBKIT_MEDIA_WEBMEDIAPLAYER_DELEGATE_H_
diff --git a/webkit/glue/webmediaplayer_impl.cc b/webkit/media/webmediaplayer_impl.cc
index 94642d4..a4fe3e9 100644
--- a/webkit/glue/webmediaplayer_impl.cc
+++ b/webkit/media/webmediaplayer_impl.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/glue/webmediaplayer_impl.h"
+#include "webkit/media/webmediaplayer_impl.h"
 
 #include <limits>
 #include <string>
@@ -30,14 +30,14 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebVideoFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
 #include "v8/include/v8.h"
-#include "webkit/glue/media/buffered_data_source.h"
-#include "webkit/glue/media/simple_data_source.h"
-#include "webkit/glue/media/media_stream_client.h"
-#include "webkit/glue/media/video_renderer_impl.h"
-#include "webkit/glue/media/web_video_renderer.h"
-#include "webkit/glue/webmediaplayer_delegate.h"
-#include "webkit/glue/webmediaplayer_proxy.h"
-#include "webkit/glue/webvideoframe_impl.h"
+#include "webkit/media/buffered_data_source.h"
+#include "webkit/media/media_stream_client.h"
+#include "webkit/media/simple_data_source.h"
+#include "webkit/media/video_renderer_impl.h"
+#include "webkit/media/web_video_renderer.h"
+#include "webkit/media/webmediaplayer_delegate.h"
+#include "webkit/media/webmediaplayer_proxy.h"
+#include "webkit/media/webvideoframe_impl.h"
 
 using WebKit::WebCanvas;
 using WebKit::WebRect;
@@ -96,7 +96,7 @@ base::TimeDelta ConvertSecondsToTimestamp(float seconds) {
 
 }  // namespace
 
-namespace webkit_glue {
+namespace webkit_media {
 
 WebMediaPlayerImpl::WebMediaPlayerImpl(
     WebKit::WebMediaPlayerClient* client,
@@ -914,4 +914,4 @@ void WebMediaPlayerImpl::IncrementExternallyAllocatedMemory() {
   v8::V8::AdjustAmountOfExternalAllocatedMemory(kPlayerExtraMemory);
 }
 
-}  // namespace webkit_glue
+}  // namespace webkit_media
diff --git a/webkit/glue/webmediaplayer_impl.h b/webkit/media/webmediaplayer_impl.h
index 2ca0b15..d7e7296 100644
--- a/webkit/glue/webmediaplayer_impl.h
+++ b/webkit/media/webmediaplayer_impl.h
@@ -45,8 +45,8 @@
 // at destruction of this class we will need to unhook it from destruction event
 // list of the main thread.
 
-#ifndef WEBKIT_GLUE_WEBMEDIAPLAYER_IMPL_H_
-#define WEBKIT_GLUE_WEBMEDIAPLAYER_IMPL_H_
+#ifndef WEBKIT_MEDIA_WEBMEDIAPLAYER_IMPL_H_
+#define WEBKIT_MEDIA_WEBMEDIAPLAYER_IMPL_H_
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
@@ -67,7 +67,7 @@ namespace media {
 class MediaLog;
 }
 
-namespace webkit_glue {
+namespace webkit_media {
 
 class MediaStreamClient;
 class WebMediaPlayerDelegate;
@@ -271,6 +271,6 @@ class WebMediaPlayerImpl
   DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl);
 };
 
-}  // namespace webkit_glue
+}  // namespace webkit_media
 
-#endif  // WEBKIT_GLUE_WEBMEDIAPLAYER_IMPL_H_
+#endif  // WEBKIT_MEDIA_WEBMEDIAPLAYER_IMPL_H_
diff --git a/webkit/glue/webmediaplayer_proxy.cc b/webkit/media/webmediaplayer_proxy.cc
index 3110f37..a596ed8 100644
--- a/webkit/glue/webmediaplayer_proxy.cc
+++ b/webkit/media/webmediaplayer_proxy.cc
@@ -2,19 +2,19 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/glue/webmediaplayer_proxy.h"
+#include "webkit/media/webmediaplayer_proxy.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "media/base/pipeline_status.h"
 #include "media/filters/chunk_demuxer.h"
-#include "webkit/glue/media/web_video_renderer.h"
-#include "webkit/glue/webmediaplayer_impl.h"
+#include "webkit/media/web_video_renderer.h"
+#include "webkit/media/webmediaplayer_impl.h"
 
 using media::PipelineStatus;
 
-namespace webkit_glue {
+namespace webkit_media {
 
 // Limits the maximum outstanding repaints posted on render thread.
 // This number of 50 is a guess, it does not take too much memory on the task
@@ -235,4 +235,4 @@ void WebMediaPlayerProxy::DemuxerClosedTask() {
   chunk_demuxer_ = NULL;
 }
 
-}  // namespace webkit_glue
+}  // namespace webkit_media
diff --git a/webkit/glue/webmediaplayer_proxy.h b/webkit/media/webmediaplayer_proxy.h
index 9fd3d25..dc96111 100644
--- a/webkit/glue/webmediaplayer_proxy.h
+++ b/webkit/media/webmediaplayer_proxy.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_GLUE_WEBMEDIAPLAYER_PROXY_H_
-#define WEBKIT_GLUE_WEBMEDIAPLAYER_PROXY_H_
+#ifndef WEBKIT_MEDIA_WEBMEDIAPLAYER_PROXY_H_
+#define WEBKIT_MEDIA_WEBMEDIAPLAYER_PROXY_H_
 
 #include <list>
 
 #include "base/memory/ref_counted.h"
 #include "base/synchronization/lock.h"
 #include "media/filters/chunk_demuxer_client.h"
-#include "webkit/glue/media/web_data_source.h"
+#include "webkit/media/web_data_source.h"
 
 class MessageLoop;
 class SkCanvas;
@@ -19,7 +19,7 @@ namespace gfx {
 class Rect;
 }
 
-namespace webkit_glue {
+namespace webkit_media {
 
 class WebMediaPlayerImpl;
 class WebVideoRenderer;
@@ -115,6 +115,6 @@ class WebMediaPlayerProxy
   DISALLOW_IMPLICIT_CONSTRUCTORS(WebMediaPlayerProxy);
 };
 
-}  // namespace webkit_glue
+}  // namespace webkit_media
 
-#endif  // WEBKIT_GLUE_WEBMEDIAPLAYER_PROXY_H_
+#endif  // WEBKIT_MEDIA_WEBMEDIAPLAYER_PROXY_H_
diff --git a/webkit/glue/webvideoframe_impl.cc b/webkit/media/webvideoframe_impl.cc
index 4440371..5a5b182 100644
--- a/webkit/glue/webvideoframe_impl.cc
+++ b/webkit/media/webvideoframe_impl.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/glue/webvideoframe_impl.h"
+#include "webkit/media/webvideoframe_impl.h"
 
 #include "base/logging.h"
 #include "media/base/video_frame.h"
@@ -10,7 +10,7 @@
 
 using WebKit::WebVideoFrame;
 
-namespace webkit_glue {
+namespace webkit_media {
 
 media::VideoFrame* WebVideoFrameImpl::toVideoFrame(
     WebVideoFrame* web_video_frame) {
@@ -80,4 +80,4 @@ const void* WebVideoFrameImpl::data(unsigned plane) const {
   return NULL;
 }
 
-}  // namespace webkit_glue
+}  // namespace webkit_media
diff --git a/webkit/glue/webvideoframe_impl.h b/webkit/media/webvideoframe_impl.h
index 9cdf691..f82c4d7 100644
--- a/webkit/glue/webvideoframe_impl.h
+++ b/webkit/media/webvideoframe_impl.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_GLUE_WEBVIDEOFRAME_IMPL_H_
-#define WEBKIT_GLUE_WEBVIDEOFRAME_IMPL_H_
+#ifndef WEBKIT_MEDIA_WEBVIDEOFRAME_IMPL_H_
+#define WEBKIT_MEDIA_WEBVIDEOFRAME_IMPL_H_
 
 #include "base/compiler_specific.h"
 #include "media/base/video_frame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebVideoFrame.h"
 
-namespace webkit_glue {
+namespace webkit_media {
 
 class WebVideoFrameImpl : public WebKit::WebVideoFrame {
  public:
@@ -31,6 +31,6 @@ class WebVideoFrameImpl : public WebKit::WebVideoFrame {
   DISALLOW_COPY_AND_ASSIGN(WebVideoFrameImpl);
 };
 
-}  // namespace webkit_glue
+}  // namespace webkit_media
 
-#endif  // WEBKIT_GLUE_WEBVIDEOFRAME_IMPL_H_
+#endif  // WEBKIT_MEDIA_WEBVIDEOFRAME_IMPL_H_
diff --git a/webkit/support/webkit_support.cc b/webkit/support/webkit_support.cc
index 9dff248..34c71f7 100644
--- a/webkit/support/webkit_support.cc
+++ b/webkit/support/webkit_support.cc
@@ -44,12 +44,12 @@
 #include "ui/gfx/gl/gl_implementation.h"
 #include "ui/gfx/gl/gl_surface.h"
 #include "webkit/appcache/web_application_cache_host_impl.h"
-#include "webkit/glue/media/video_renderer_impl.h"
 #include "webkit/glue/user_agent.h"
 #include "webkit/glue/webkit_constants.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/glue/webkitplatformsupport_impl.h"
-#include "webkit/glue/webmediaplayer_impl.h"
+#include "webkit/media/video_renderer_impl.h"
+#include "webkit/media/webmediaplayer_impl.h"
 #include "webkit/plugins/npapi/plugin_list.h"
 #include "webkit/plugins/npapi/webplugin_impl.h"
 #include "webkit/plugins/npapi/webplugin_page_delegate.h"
@@ -318,14 +318,14 @@ WebKit::WebMediaPlayer* CreateMediaPlayer(WebFrame* frame,
   scoped_ptr<media::FilterCollection> collection(
       new media::FilterCollection());
 
-  scoped_refptr<webkit_glue::VideoRendererImpl> video_renderer(
-      new webkit_glue::VideoRendererImpl(false));
+  scoped_refptr<webkit_media::VideoRendererImpl> video_renderer(
+      new webkit_media::VideoRendererImpl(false));
   collection->AddVideoRenderer(video_renderer);
 
-  scoped_ptr<webkit_glue::WebMediaPlayerImpl> result(
-      new webkit_glue::WebMediaPlayerImpl(
+  scoped_ptr<webkit_media::WebMediaPlayerImpl> result(
+      new webkit_media::WebMediaPlayerImpl(
           client,
-          base::WeakPtr<webkit_glue::WebMediaPlayerDelegate>(),
+          base::WeakPtr<webkit_media::WebMediaPlayerDelegate>(),
           collection.release(),
           message_loop_factory.release(),
           NULL,
diff --git a/webkit/support/webkit_support.gyp b/webkit/support/webkit_support.gyp
index a6d99cd..ac9ffa2 100644
--- a/webkit/support/webkit_support.gyp
+++ b/webkit/support/webkit_support.gyp
@@ -1,4 +1,4 @@
-# Copyright (c) 2010 The Chromium Authors. All rights reserved.
+# Copyright (c) 2011 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.
 
@@ -11,6 +11,7 @@
     '../fileapi/webkit_fileapi.gypi',
     '../glue/webkit_glue.gypi',
     '../gpu/webkit_gpu.gypi',
+    '../media/webkit_media.gypi',
     '../quota/webkit_quota.gypi',
     'webkit_support.gypi',
   ],
diff --git a/webkit/support/webkit_support.gypi b/webkit/support/webkit_support.gypi
index ae165eb..33b17d2 100644
--- a/webkit/support/webkit_support.gypi
+++ b/webkit/support/webkit_support.gypi
@@ -24,6 +24,7 @@
         'fileapi',
         'glue',
         'webkit_gpu',
+        'webkit_media',
         'webkit_support_common',
       ],
       'include_dirs': [
diff --git a/webkit/tools/test_shell/test_shell.gypi b/webkit/tools/test_shell/test_shell.gypi
index b4b18a3..07cdeb2 100644
--- a/webkit/tools/test_shell/test_shell.gypi
+++ b/webkit/tools/test_shell/test_shell.gypi
@@ -46,6 +46,7 @@
         '<(DEPTH)/webkit/support/webkit_support.gyp:glue',
         '<(DEPTH)/webkit/support/webkit_support.gyp:quota',
         '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_gpu',
+        '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_media',
         '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_resources',
         '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_support_common',
       ],
@@ -416,9 +417,6 @@
         '../../glue/dom_serializer_unittest.cc',
         '../../glue/glue_serialize_unittest.cc',
         '../../glue/iframe_redirect_unittest.cc',
-        '../../glue/media/buffered_data_source_unittest.cc',
-        '../../glue/media/buffered_resource_loader_unittest.cc',
-        '../../glue/media/simple_data_source_unittest.cc',
         '../../glue/mimetype_unittest.cc',
         '../../glue/multipart_response_delegate_unittest.cc',
         '../../glue/regular_expression_unittest.cc',
@@ -428,6 +426,9 @@
         '../../glue/webframe_unittest.cc',
         '../../glue/webkit_glue_unittest.cc',
         '../../glue/webview_unittest.cc',
+        '../../media/buffered_data_source_unittest.cc',
+        '../../media/buffered_resource_loader_unittest.cc',
+        '../../media/simple_data_source_unittest.cc',
         '../../mocks/mock_resource_loader_bridge.h',
         '../../mocks/mock_webframeclient.h',
         '../../mocks/mock_weburlloader.cc',
diff --git a/webkit/tools/test_shell/test_webview_delegate.cc b/webkit/tools/test_shell/test_webview_delegate.cc
index 9231d1d..d1dea82 100644
--- a/webkit/tools/test_shell/test_webview_delegate.cc
+++ b/webkit/tools/test_shell/test_webview_delegate.cc
@@ -60,12 +60,12 @@
 #include "ui/gfx/point.h"
 #include "webkit/appcache/web_application_cache_host_impl.h"
 #include "webkit/glue/glue_serialize.h"
-#include "webkit/glue/media/video_renderer_impl.h"
 #include "webkit/glue/webdropdata.h"
 #include "webkit/glue/webkit_glue.h"
-#include "webkit/glue/webmediaplayer_impl.h"
 #include "webkit/glue/webpreferences.h"
 #include "webkit/glue/window_open_disposition.h"
+#include "webkit/media/video_renderer_impl.h"
+#include "webkit/media/webmediaplayer_impl.h"
 #include "webkit/plugins/npapi/webplugin_impl.h"
 #include "webkit/plugins/npapi/plugin_list.h"
 #include "webkit/plugins/npapi/webplugin_delegate_impl.h"
@@ -647,14 +647,14 @@ WebMediaPlayer* TestWebViewDelegate::createMediaPlayer(
   scoped_ptr<media::FilterCollection> collection(
       new media::FilterCollection());
 
-  scoped_refptr<webkit_glue::VideoRendererImpl> video_renderer(
-      new webkit_glue::VideoRendererImpl(false));
+  scoped_refptr<webkit_media::VideoRendererImpl> video_renderer(
+      new webkit_media::VideoRendererImpl(false));
   collection->AddVideoRenderer(video_renderer);
 
-  scoped_ptr<webkit_glue::WebMediaPlayerImpl> result(
-      new webkit_glue::WebMediaPlayerImpl(
+  scoped_ptr<webkit_media::WebMediaPlayerImpl> result(
+      new webkit_media::WebMediaPlayerImpl(
           client,
-          base::WeakPtr<webkit_glue::WebMediaPlayerDelegate>(),
+          base::WeakPtr<webkit_media::WebMediaPlayerDelegate>(),
           collection.release(),
           message_loop_factory.release(),
           NULL,