move all media and media_stream related files into content/browser/renderer_host/media and content/renderer/media

BUG=none
TEST=try bots
Review URL: http://codereview.chromium.org/7135008

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

38 files changed, 112 insertions, 102 deletions

diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index a04d532..10e618c 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -1971,14 +1971,14 @@
         '../content/browser/in_process_webkit/indexed_db_quota_client_unittest.cc',
         '../content/browser/in_process_webkit/webkit_context_unittest.cc',
         '../content/browser/in_process_webkit/webkit_thread_unittest.cc',
-        '../content/browser/media_stream/video_capture_manager_unittest.cc',
         '../content/browser/plugin_service_unittest.cc',
-        '../content/browser/renderer_host/audio_renderer_host_unittest.cc',
+        '../content/browser/renderer_host/media/audio_renderer_host_unittest.cc',
+        '../content/browser/renderer_host/media/video_capture_host_unittest.cc',
+        '../content/browser/renderer_host/media/video_capture_manager_unittest.cc',
         '../content/browser/renderer_host/render_view_host_unittest.cc',
         '../content/browser/renderer_host/render_widget_host_unittest.cc',
         '../content/browser/renderer_host/resource_dispatcher_host_unittest.cc',
         '../content/browser/renderer_host/resource_queue_unittest.cc',
-        '../content/browser/renderer_host/video_capture_host_unittest.cc',
         '../content/browser/resolve_proxy_msg_helper_unittest.cc',
         '../content/browser/site_instance_unittest.cc',
         '../content/browser/speech/endpointer/endpointer_unittest.cc',
@@ -2011,8 +2011,8 @@
         '../content/renderer/media/audio_message_filter_unittest.cc',
         '../content/renderer/media/audio_renderer_impl_unittest.cc',
         '../content/renderer/media/video_capture_impl_unittest.cc',
+        '../content/renderer/media/video_capture_message_filter_unittest.cc',
         '../content/renderer/paint_aggregator_unittest.cc',
-        '../content/renderer/video_capture_message_filter_unittest.cc',
         '../testing/gtest_mac_unittest.mm',
         '../third_party/cld/encodings/compact_lang_det/compact_lang_det_unittest_small.cc',
         '../webkit/fileapi/file_system_dir_url_request_job_unittest.cc',
diff --git a/content/browser/renderer_host/browser_render_process_host.cc b/content/browser/renderer_host/browser_render_process_host.cc
index 3b5dad0..f30ae78 100644
--- a/content/browser/renderer_host/browser_render_process_host.cc
+++ b/content/browser/renderer_host/browser_render_process_host.cc
@@ -40,14 +40,13 @@
 #include "content/browser/in_process_webkit/indexed_db_dispatcher_host.h"
 #include "content/browser/mime_registry_message_filter.h"
 #include "content/browser/plugin_service.h"
-#include "content/browser/renderer_host/audio_input_renderer_host.h"
-#include "content/browser/renderer_host/audio_renderer_host.h"
 #include "content/browser/renderer_host/blob_message_filter.h"
 #include "content/browser/renderer_host/clipboard_message_filter.h"
 #include "content/browser/renderer_host/database_message_filter.h"
-#include "content/browser/resolve_proxy_msg_helper.h"
 #include "content/browser/renderer_host/file_utilities_message_filter.h"
 #include "content/browser/renderer_host/gpu_message_filter.h"
+#include "content/browser/renderer_host/media/audio_input_renderer_host.h"
+#include "content/browser/renderer_host/media/audio_renderer_host.h"
 #include "content/browser/renderer_host/p2p/socket_dispatcher_host.h"
 #include "content/browser/renderer_host/pepper_file_message_filter.h"
 #include "content/browser/renderer_host/pepper_message_filter.h"
@@ -59,6 +58,7 @@
 #include "content/browser/renderer_host/render_widget_host.h"
 #include "content/browser/renderer_host/resource_message_filter.h"
 #include "content/browser/renderer_host/socket_stream_dispatcher_host.h"
+#include "content/browser/resolve_proxy_msg_helper.h"
 #include "content/browser/speech/speech_input_dispatcher_host.h"
 #include "content/browser/trace_message_filter.h"
 #include "content/browser/user_metrics.h"
diff --git a/content/browser/renderer_host/media/OWNERS b/content/browser/renderer_host/media/OWNERS
new file mode 100644
index 0000000..d37c12f
--- /dev/null
+++ b/content/browser/renderer_host/media/OWNERS
@@ -0,0 +1,9 @@
+acolwell@chromium.org
+annacc@chromium.org
+ddorwin@chormium.org
+fischman@chromium.org
+imasaki@chromium.org
+scherkus@chromium.org
+sjl@chromium.org
+vrk@chromium.org
+wjia@chromium.org
diff --git a/content/browser/renderer_host/audio_common.cc b/content/browser/renderer_host/media/audio_common.cc
index 50bc068..7126ddb 100644
--- a/content/browser/renderer_host/audio_common.cc
+++ b/content/browser/renderer_host/media/audio_common.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 "content/browser/renderer_host/audio_common.h"
+#include "content/browser/renderer_host/media/audio_common.h"
 
 #include "base/time.h"
 #include "media/audio/audio_parameters.h"
diff --git a/content/browser/renderer_host/audio_common.h b/content/browser/renderer_host/media/audio_common.h
index 8e60316..52b7337 100644
--- a/content/browser/renderer_host/audio_common.h
+++ b/content/browser/renderer_host/media/audio_common.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 CONTENT_BROWSER_RENDERER_HOST_AUDIO_COMMON_H_
-#define CONTENT_BROWSER_RENDERER_HOST_AUDIO_COMMON_H_
+#ifndef CONTENT_BROWSER_RENDERER_HOST_MEDIA_AUDIO_COMMON_H_
+#define CONTENT_BROWSER_RENDERER_HOST_MEDIA_AUDIO_COMMON_H_
 #pragma once
 
 #include "base/basictypes.h"
@@ -14,4 +14,4 @@ struct AudioParameters;
 // of audio parameters.
 uint32 SelectSamplesPerPacket(const AudioParameters& params);
 
-#endif  // CONTENT_BROWSER_RENDERER_HOST_AUDIO_COMMON_H_
+#endif  // CONTENT_BROWSER_RENDERER_HOST_MEDIA_AUDIO_COMMON_H_
diff --git a/content/browser/renderer_host/audio_input_renderer_host.cc b/content/browser/renderer_host/media/audio_input_renderer_host.cc
index 2aee865..4a5c57a 100644
--- a/content/browser/renderer_host/audio_input_renderer_host.cc
+++ b/content/browser/renderer_host/media/audio_input_renderer_host.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 "content/browser/renderer_host/audio_input_renderer_host.h"
+#include "content/browser/renderer_host/media/audio_input_renderer_host.h"
 
 #include "base/metrics/histogram.h"
 #include "base/process.h"
 #include "base/shared_memory.h"
-#include "content/browser/renderer_host/audio_common.h"
-#include "content/browser/renderer_host/audio_input_sync_writer.h"
+#include "content/browser/renderer_host/media/audio_common.h"
+#include "content/browser/renderer_host/media/audio_input_sync_writer.h"
 #include "content/common/audio_messages.h"
 #include "ipc/ipc_logging.h"
 
diff --git a/content/browser/renderer_host/audio_input_renderer_host.h b/content/browser/renderer_host/media/audio_input_renderer_host.h
index 4452569..82b79a3 100644
--- a/content/browser/renderer_host/audio_input_renderer_host.h
+++ b/content/browser/renderer_host/media/audio_input_renderer_host.h
@@ -15,8 +15,8 @@
 // For low latency audio, a SyncSocket pair is used to signal buffer readiness
 // without having to route messages using the IO thread.
 
-#ifndef CONTENT_BROWSER_RENDERER_HOST_AUDIO_INPUT_RENDERER_HOST_H_
-#define CONTENT_BROWSER_RENDERER_HOST_AUDIO_INPUT_RENDERER_HOST_H_
+#ifndef CONTENT_BROWSER_RENDERER_HOST_MEDIA_AUDIO_INPUT_RENDERER_HOST_H_
+#define CONTENT_BROWSER_RENDERER_HOST_MEDIA_AUDIO_INPUT_RENDERER_HOST_H_
 #pragma once
 
 #include <map>
@@ -161,4 +161,4 @@ class AudioInputRendererHost : public BrowserMessageFilter,
   DISALLOW_COPY_AND_ASSIGN(AudioInputRendererHost);
 };
 
-#endif  // CONTENT_BROWSER_RENDERER_HOST_AUDIO_INPUT_RENDERER_HOST_H_
+#endif  // CONTENT_BROWSER_RENDERER_HOST_MEDIA_AUDIO_INPUT_RENDERER_HOST_H_
diff --git a/content/browser/renderer_host/audio_input_sync_writer.cc b/content/browser/renderer_host/media/audio_input_sync_writer.cc
index cd4acca..b027479 100644
--- a/content/browser/renderer_host/audio_input_sync_writer.cc
+++ b/content/browser/renderer_host/media/audio_input_sync_writer.cc
@@ -1,8 +1,8 @@
-// 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 "content/browser/renderer_host/audio_input_sync_writer.h"
+#include "content/browser/renderer_host/media/audio_input_sync_writer.h"
 
 #include "base/process_util.h"
 #include "base/shared_memory.h"
diff --git a/content/browser/renderer_host/audio_input_sync_writer.h b/content/browser/renderer_host/media/audio_input_sync_writer.h
index af95e069..5dc89df 100644
--- a/content/browser/renderer_host/audio_input_sync_writer.h
+++ b/content/browser/renderer_host/media/audio_input_sync_writer.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 CONTENT_BROWSER_RENDERER_HOST_AUDIO_INPUT_SYNC_WRITER_H_
-#define CONTENT_BROWSER_RENDERER_HOST_AUDIO_INPUT_SYNC_WRITER_H_
+#ifndef CONTENT_BROWSER_RENDERER_HOST_MEDIA_AUDIO_INPUT_SYNC_WRITER_H_
+#define CONTENT_BROWSER_RENDERER_HOST_MEDIA_AUDIO_INPUT_SYNC_WRITER_H_
 #pragma once
 
 #include "base/file_descriptor_posix.h"
@@ -51,4 +51,4 @@ class AudioInputSyncWriter : public media::AudioInputController::SyncWriter {
   DISALLOW_IMPLICIT_CONSTRUCTORS(AudioInputSyncWriter);
 };
 
-#endif  // CONTENT_BROWSER_RENDERER_HOST_AUDIO_INPUT_SYNC_WRITER_H_
+#endif  // CONTENT_BROWSER_RENDERER_HOST_MEDIA_AUDIO_INPUT_SYNC_WRITER_H_
diff --git a/content/browser/renderer_host/audio_renderer_host.cc b/content/browser/renderer_host/media/audio_renderer_host.cc
index 2f4bce1..5ee647c 100644
--- a/content/browser/renderer_host/audio_renderer_host.cc
+++ b/content/browser/renderer_host/media/audio_renderer_host.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 "content/browser/renderer_host/audio_renderer_host.h"
+#include "content/browser/renderer_host/media/audio_renderer_host.h"
 
 #include "base/metrics/histogram.h"
 #include "base/process.h"
 #include "base/shared_memory.h"
-#include "content/browser/renderer_host/audio_common.h"
-#include "content/browser/renderer_host/audio_sync_reader.h"
+#include "content/browser/renderer_host/media/audio_common.h"
+#include "content/browser/renderer_host/media/audio_sync_reader.h"
 #include "content/common/audio_messages.h"
 #include "ipc/ipc_logging.h"
 
diff --git a/content/browser/renderer_host/audio_renderer_host.h b/content/browser/renderer_host/media/audio_renderer_host.h
index 30dee10..944857f 100644
--- a/content/browser/renderer_host/audio_renderer_host.h
+++ b/content/browser/renderer_host/media/audio_renderer_host.h
@@ -49,8 +49,8 @@
 // pair is used to signal buffer readiness without having to route messages
 // using the IO thread.
 
-#ifndef CONTENT_BROWSER_RENDERER_HOST_AUDIO_RENDERER_HOST_H_
-#define CONTENT_BROWSER_RENDERER_HOST_AUDIO_RENDERER_HOST_H_
+#ifndef CONTENT_BROWSER_RENDERER_HOST_MEDIA_AUDIO_RENDERER_HOST_H_
+#define CONTENT_BROWSER_RENDERER_HOST_MEDIA_AUDIO_RENDERER_HOST_H_
 #pragma once
 
 #include <map>
@@ -219,4 +219,4 @@ class AudioRendererHost : public BrowserMessageFilter,
   DISALLOW_COPY_AND_ASSIGN(AudioRendererHost);
 };
 
-#endif  // CONTENT_BROWSER_RENDERER_HOST_AUDIO_RENDERER_HOST_H_
+#endif  // CONTENT_BROWSER_RENDERER_HOST_MEDIA_AUDIO_RENDERER_HOST_H_
diff --git a/content/browser/renderer_host/audio_renderer_host_unittest.cc b/content/browser/renderer_host/media/audio_renderer_host_unittest.cc
index 6a13acd..df2d5b0 100644
--- a/content/browser/renderer_host/audio_renderer_host_unittest.cc
+++ b/content/browser/renderer_host/media/audio_renderer_host_unittest.cc
@@ -8,7 +8,7 @@
 #include "base/process_util.h"
 #include "base/sync_socket.h"
 #include "content/browser/browser_thread.h"
-#include "content/browser/renderer_host/audio_renderer_host.h"
+#include "content/browser/renderer_host/media/audio_renderer_host.h"
 #include "content/common/audio_messages.h"
 #include "ipc/ipc_message_utils.h"
 #include "media/audio/audio_manager.h"
diff --git a/content/browser/renderer_host/audio_sync_reader.cc b/content/browser/renderer_host/media/audio_sync_reader.cc
index 261bec0..b6f779e 100644
--- a/content/browser/renderer_host/audio_sync_reader.cc
+++ b/content/browser/renderer_host/media/audio_sync_reader.cc
@@ -1,8 +1,8 @@
-// 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 "content/browser/renderer_host/audio_sync_reader.h"
+#include "content/browser/renderer_host/media/audio_sync_reader.h"
 
 #include "base/process_util.h"
 #include "base/shared_memory.h"
diff --git a/content/browser/renderer_host/audio_sync_reader.h b/content/browser/renderer_host/media/audio_sync_reader.h
index 054bb52..ddb5d61 100644
--- a/content/browser/renderer_host/audio_sync_reader.h
+++ b/content/browser/renderer_host/media/audio_sync_reader.h
@@ -1,9 +1,9 @@
-// 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 CONTENT_BROWSER_RENDERER_HOST_AUDIO_SYNC_READER_H_
-#define CONTENT_BROWSER_RENDERER_HOST_AUDIO_SYNC_READER_H_
+#ifndef CONTENT_BROWSER_RENDERER_HOST_MEDIA_AUDIO_SYNC_READER_H_
+#define CONTENT_BROWSER_RENDERER_HOST_MEDIA_AUDIO_SYNC_READER_H_
 #pragma once
 
 #include "base/file_descriptor_posix.h"
@@ -53,4 +53,4 @@ class AudioSyncReader : public media::AudioOutputController::SyncReader {
   DISALLOW_COPY_AND_ASSIGN(AudioSyncReader);
 };
 
-#endif  // CONTENT_BROWSER_RENDERER_HOST_AUDIO_SYNC_READER_H_
+#endif  // CONTENT_BROWSER_RENDERER_HOST_MEDIA_AUDIO_SYNC_READER_H_
diff --git a/content/browser/media_stream/media_stream_provider.cc b/content/browser/renderer_host/media/media_stream_provider.cc
index 1b0cde9..d446929 100644
--- a/content/browser/media_stream/media_stream_provider.cc
+++ b/content/browser/renderer_host/media/media_stream_provider.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 "content/browser/media_stream/media_stream_provider.h"
+#include "content/browser/renderer_host/media/media_stream_provider.h"
 
 namespace media_stream {
 
diff --git a/content/browser/media_stream/media_stream_provider.h b/content/browser/renderer_host/media/media_stream_provider.h
index 632d845..a864847 100644
--- a/content/browser/media_stream/media_stream_provider.h
+++ b/content/browser/renderer_host/media/media_stream_provider.h
@@ -9,8 +9,8 @@
 // The MediaStreamManager is expected to be called on Browser::IO thread and
 // the listener will be called on the same thread.
 
-#ifndef CONTENT_BROWSER_MEDIA_STREAM_MEDIA_STREAM_PROVIDER_H_
-#define CONTENT_BROWSER_MEDIA_STREAM_MEDIA_STREAM_PROVIDER_H_
+#ifndef CONTENT_BROWSER_RENDERER_HOST_MEDIA_MEDIA_STREAM_PROVIDER_H_
+#define CONTENT_BROWSER_RENDERER_HOST_MEDIA_MEDIA_STREAM_PROVIDER_H_
 
 #include <list>
 #include <string>
@@ -105,4 +105,4 @@ class MediaStreamProvider {
 
 }  // namespace media_stream
 
-#endif  // CONTENT_BROWSER_MEDIA_STREAM_MEDIA_STREAM_PROVIDER_H_
+#endif  // CONTENT_BROWSER_RENDERER_HOST_MEDIA_MEDIA_STREAM_PROVIDER_H_
diff --git a/content/browser/renderer_host/video_capture_controller.cc b/content/browser/renderer_host/media/video_capture_controller.cc
index c36232b..228656d 100644
--- a/content/browser/renderer_host/video_capture_controller.cc
+++ b/content/browser/renderer_host/media/video_capture_controller.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/browser/renderer_host/video_capture_controller.h"
+#include "content/browser/renderer_host/media/video_capture_controller.h"
 
 #include "base/stl_util-inl.h"
 #include "content/browser/browser_thread.h"
-#include "content/browser/media_stream/video_capture_manager.h"
+#include "content/browser/renderer_host/media/video_capture_manager.h"
 #include "media/base/yuv_convert.h"
 
 // The number of TransportDIBs VideoCaptureController allocate.
diff --git a/content/browser/renderer_host/video_capture_controller.h b/content/browser/renderer_host/media/video_capture_controller.h
index 4879492..432ac4a 100644
--- a/content/browser/renderer_host/video_capture_controller.h
+++ b/content/browser/renderer_host/media/video_capture_controller.h
@@ -12,8 +12,8 @@
 // from a VideoCaptureDevice object and do color conversion straight into the
 // TransportDIBs to avoid a memory copy.
 
-#ifndef CONTENT_BROWSER_RENDERER_HOST_VIDEO_CAPTURE_CONTROLLER_H_
-#define CONTENT_BROWSER_RENDERER_HOST_VIDEO_CAPTURE_CONTROLLER_H_
+#ifndef CONTENT_BROWSER_RENDERER_HOST_MEDIA_VIDEO_CAPTURE_CONTROLLER_H_
+#define CONTENT_BROWSER_RENDERER_HOST_MEDIA_VIDEO_CAPTURE_CONTROLLER_H_
 
 #include <list>
 #include <map>
@@ -22,7 +22,7 @@
 #include "base/process.h"
 #include "base/synchronization/lock.h"
 #include "base/task.h"
-#include "content/browser/renderer_host/video_capture_controller_event_handler.h"
+#include "content/browser/renderer_host/media/video_capture_controller_event_handler.h"
 #include "media/video/capture/video_capture_device.h"
 #include "media/video/capture/video_capture_types.h"
 #include "ui/gfx/surface/transport_dib.h"
@@ -90,4 +90,4 @@ class VideoCaptureController
   DISALLOW_IMPLICIT_CONSTRUCTORS(VideoCaptureController);
 };
 
-#endif  // CONTENT_BROWSER_RENDERER_HOST_VIDEO_CAPTURE_CONTROLLER_H_
+#endif  // CONTENT_BROWSER_RENDERER_HOST_MEDIA_VIDEO_CAPTURE_CONTROLLER_H_
diff --git a/content/browser/renderer_host/video_capture_controller_event_handler.cc b/content/browser/renderer_host/media/video_capture_controller_event_handler.cc
index e9fcf3f..61ccc4a 100644
--- a/content/browser/renderer_host/video_capture_controller_event_handler.cc
+++ b/content/browser/renderer_host/media/video_capture_controller_event_handler.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 "content/browser/renderer_host/video_capture_controller_event_handler.h"
+#include "content/browser/renderer_host/media/video_capture_controller_event_handler.h"
 
 VideoCaptureControllerID::VideoCaptureControllerID(int32 rid, int did)
     : routing_id(rid),
diff --git a/content/browser/renderer_host/video_capture_controller_event_handler.h b/content/browser/renderer_host/media/video_capture_controller_event_handler.h
index 397e5ae..73424bb 100644
--- a/content/browser/renderer_host/video_capture_controller_event_handler.h
+++ b/content/browser/renderer_host/media/video_capture_controller_event_handler.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 CONTENT_BROWSER_RENDERER_HOST_VIDEO_CAPTURE_CONTROLLER_EVENT_HANDLER_H_
-#define CONTENT_BROWSER_RENDERER_HOST_VIDEO_CAPTURE_CONTROLLER_EVENT_HANDLER_H_
+#ifndef CONTENT_BROWSER_RENDERER_HOST_MEDIA_VIDEO_CAPTURE_CONTROLLER_EVENT_HANDLER_H_
+#define CONTENT_BROWSER_RENDERER_HOST_MEDIA_VIDEO_CAPTURE_CONTROLLER_EVENT_HANDLER_H_
 
 #include "base/shared_memory.h"
 #include "base/time.h"
@@ -49,4 +49,4 @@ class VideoCaptureControllerEventHandler {
   virtual ~VideoCaptureControllerEventHandler() {}
 };
 
-#endif  // CONTENT_BROWSER_RENDERER_HOST_VIDEO_CAPTURE_CONTROLLER_EVENT_HANDLER_H_
+#endif  // CONTENT_BROWSER_RENDERER_HOST_MEDIA_VIDEO_CAPTURE_CONTROLLER_EVENT_HANDLER_H_
diff --git a/content/browser/renderer_host/video_capture_host.cc b/content/browser/renderer_host/media/video_capture_host.cc
index f4e4011..01cd3e0 100644
--- a/content/browser/renderer_host/video_capture_host.cc
+++ b/content/browser/renderer_host/media/video_capture_host.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 "content/browser/renderer_host/video_capture_host.h"
+#include "content/browser/renderer_host/media/video_capture_host.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/stl_util-inl.h"
diff --git a/content/browser/renderer_host/video_capture_host.h b/content/browser/renderer_host/media/video_capture_host.h
index d2f611f05..1a57a04 100644
--- a/content/browser/renderer_host/video_capture_host.h
+++ b/content/browser/renderer_host/media/video_capture_host.h
@@ -33,14 +33,14 @@
 //      |         (kStopped)                  |
 //      v                                     v
 
-#ifndef CONTENT_BROWSER_RENDERER_HOST_VIDEO_CAPTURE_HOST_H_
-#define CONTENT_BROWSER_RENDERER_HOST_VIDEO_CAPTURE_HOST_H_
+#ifndef CONTENT_BROWSER_RENDERER_HOST_MEDIA_VIDEO_CAPTURE_HOST_H_
+#define CONTENT_BROWSER_RENDERER_HOST_MEDIA_VIDEO_CAPTURE_HOST_H_
 
 #include <map>
 
 #include "base/memory/ref_counted.h"
 #include "content/browser/browser_message_filter.h"
-#include "content/browser/renderer_host/video_capture_controller.h"
+#include "content/browser/renderer_host/media/video_capture_controller.h"
 #include "ipc/ipc_message.h"
 
 class VideoCaptureHost : public BrowserMessageFilter,
@@ -134,4 +134,4 @@ class VideoCaptureHost : public BrowserMessageFilter,
   DISALLOW_COPY_AND_ASSIGN(VideoCaptureHost);
 };
 
-#endif  // CONTENT_BROWSER_RENDERER_HOST_VIDEO_CAPTURE_HOST_H_
+#endif  // CONTENT_BROWSER_RENDERER_HOST_MEDIA_VIDEO_CAPTURE_HOST_H_
diff --git a/content/browser/renderer_host/video_capture_host_unittest.cc b/content/browser/renderer_host/media/video_capture_host_unittest.cc
index e9986ca..a7a56ab 100644
--- a/content/browser/renderer_host/video_capture_host_unittest.cc
+++ b/content/browser/renderer_host/media/video_capture_host_unittest.cc
@@ -12,8 +12,8 @@
 #include "base/stl_util-inl.h"
 #include "base/stringprintf.h"
 #include "content/browser/browser_thread.h"
-#include "content/browser/media_stream/video_capture_manager.h"
-#include "content/browser/renderer_host/video_capture_host.h"
+#include "content/browser/renderer_host/media/video_capture_host.h"
+#include "content/browser/renderer_host/media/video_capture_manager.h"
 #include "content/common/video_capture_messages.h"
 #include "media/video/capture/video_capture_types.h"
 
diff --git a/content/browser/media_stream/video_capture_manager.cc b/content/browser/renderer_host/media/video_capture_manager.cc
index 1fdba28..787f577 100644
--- a/content/browser/media_stream/video_capture_manager.cc
+++ b/content/browser/renderer_host/media/video_capture_manager.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 "content/browser/media_stream/video_capture_manager.h"
+#include "content/browser/renderer_host/media/video_capture_manager.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "content/browser/browser_thread.h"
diff --git a/content/browser/media_stream/video_capture_manager.h b/content/browser/renderer_host/media/video_capture_manager.h
index 122d553..9823995 100644
--- a/content/browser/media_stream/video_capture_manager.h
+++ b/content/browser/renderer_host/media/video_capture_manager.h
@@ -7,14 +7,14 @@
 // the Browser::IO thread. VideoCaptureManager will open OS dependent instances
 // of VideoCaptureDevice. A device can only be opened once.
 
-#ifndef CONTENT_BROWSER_MEDIA_STREAM_VIDEO_CAPTURE_MANAGER_H_
-#define CONTENT_BROWSER_MEDIA_STREAM_VIDEO_CAPTURE_MANAGER_H_
+#ifndef CONTENT_BROWSER_RENDERER_HOST_MEDIA_VIDEO_CAPTURE_MANAGER_H_
+#define CONTENT_BROWSER_RENDERER_HOST_MEDIA_VIDEO_CAPTURE_MANAGER_H_
 
 #include <map>
 
 #include "base/lazy_instance.h"
 #include "base/threading/thread.h"
-#include "content/browser/media_stream/media_stream_provider.h"
+#include "content/browser/renderer_host/media/media_stream_provider.h"
 #include "media/video/capture/video_capture_device.h"
 #include "media/video/capture/video_capture_types.h"
 
@@ -122,4 +122,4 @@ class VideoCaptureManager : public MediaStreamProvider {
 
 DISABLE_RUNNABLE_METHOD_REFCOUNT(media_stream::VideoCaptureManager);
 
-#endif  // CONTENT_BROWSER_MEDIA_STREAM_VIDEO_CAPTURE_MANAGER_H_
+#endif  // CONTENT_BROWSER_RENDERER_HOST_MEDIA_VIDEO_CAPTURE_MANAGER_H_
diff --git a/content/browser/media_stream/video_capture_manager_unittest.cc b/content/browser/renderer_host/media/video_capture_manager_unittest.cc
index 8778161..22a6066 100644
--- a/content/browser/media_stream/video_capture_manager_unittest.cc
+++ b/content/browser/renderer_host/media/video_capture_manager_unittest.cc
@@ -10,8 +10,8 @@
 #include "base/message_loop.h"
 #include "base/process_util.h"
 #include "content/browser/browser_thread.h"
-#include "content/browser/media_stream/media_stream_provider.h"
-#include "content/browser/media_stream/video_capture_manager.h"
+#include "content/browser/renderer_host/media/media_stream_provider.h"
+#include "content/browser/renderer_host/media/video_capture_manager.h"
 #include "media/video/capture/video_capture_device.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/content/content_browser.gypi b/content/content_browser.gypi
index ce212c9..3c26810 100644
--- a/content/content_browser.gypi
+++ b/content/content_browser.gypi
@@ -176,10 +176,6 @@
         'browser/load_from_memory_cache_details.cc',
         'browser/load_from_memory_cache_details.h',
         'browser/load_notification_details.h',
-        'browser/media_stream/media_stream_provider.cc',
-        'browser/media_stream/media_stream_provider.h',
-        'browser/media_stream/video_capture_manager.cc',
-        'browser/media_stream/video_capture_manager.h',
         'browser/mime_registry_message_filter.cc',
         'browser/mime_registry_message_filter.h',
         # TODO:  These should be moved to test_support (see below), but
@@ -208,16 +204,6 @@
         'browser/renderer_host/accelerated_surface_container_manager_mac.h',
         'browser/renderer_host/async_resource_handler.cc',
         'browser/renderer_host/async_resource_handler.h',
-        'browser/renderer_host/audio_common.cc',
-        'browser/renderer_host/audio_common.h',
-        'browser/renderer_host/audio_input_renderer_host.cc',
-        'browser/renderer_host/audio_input_renderer_host.h',
-        'browser/renderer_host/audio_input_sync_writer.cc',
-        'browser/renderer_host/audio_input_sync_writer.h',
-        'browser/renderer_host/audio_renderer_host.cc',
-        'browser/renderer_host/audio_renderer_host.h',
-        'browser/renderer_host/audio_sync_reader.cc',
-        'browser/renderer_host/audio_sync_reader.h',
         'browser/renderer_host/backing_store.cc',
         'browser/renderer_host/backing_store.h',
         'browser/renderer_host/backing_store_mac.h',
@@ -248,6 +234,26 @@
         'browser/renderer_host/global_request_id.h',
         'browser/renderer_host/gpu_message_filter.cc',
         'browser/renderer_host/gpu_message_filter.h',
+        'browser/renderer_host/media/audio_common.cc',
+        'browser/renderer_host/media/audio_common.h',
+        'browser/renderer_host/media/audio_input_renderer_host.cc',
+        'browser/renderer_host/media/audio_input_renderer_host.h',
+        'browser/renderer_host/media/audio_input_sync_writer.cc',
+        'browser/renderer_host/media/audio_input_sync_writer.h',
+        'browser/renderer_host/media/audio_renderer_host.cc',
+        'browser/renderer_host/media/audio_renderer_host.h',
+        'browser/renderer_host/media/audio_sync_reader.cc',
+        'browser/renderer_host/media/audio_sync_reader.h',
+        'browser/renderer_host/media/media_stream_provider.cc',
+        'browser/renderer_host/media/media_stream_provider.h',
+        'browser/renderer_host/media/video_capture_controller.cc',
+        'browser/renderer_host/media/video_capture_controller.h',
+        'browser/renderer_host/media/video_capture_controller_event_handler.cc',
+        'browser/renderer_host/media/video_capture_controller_event_handler.h',
+        'browser/renderer_host/media/video_capture_host.cc',
+        'browser/renderer_host/media/video_capture_host.h',
+        'browser/renderer_host/media/video_capture_manager.cc',
+        'browser/renderer_host/media/video_capture_manager.h',
         'browser/renderer_host/pepper_file_message_filter.cc',
         'browser/renderer_host/pepper_file_message_filter.h',
         'browser/renderer_host/pepper_message_filter.cc',
@@ -305,12 +311,6 @@
         'browser/renderer_host/sync_resource_handler.h',
         'browser/renderer_host/x509_user_cert_resource_handler.cc',
         'browser/renderer_host/x509_user_cert_resource_handler.h',
-        'browser/renderer_host/video_capture_controller.cc',
-        'browser/renderer_host/video_capture_controller.h',
-        'browser/renderer_host/video_capture_controller_event_handler.cc',
-        'browser/renderer_host/video_capture_controller_event_handler.h',
-        'browser/renderer_host/video_capture_host.cc',
-        'browser/renderer_host/video_capture_host.h',
         'browser/resolve_proxy_msg_helper.cc',
         'browser/resolve_proxy_msg_helper.h',
         'browser/resource_context.cc',
diff --git a/content/content_renderer.gypi b/content/content_renderer.gypi
index 15aba8b..502db05 100644
--- a/content/content_renderer.gypi
+++ b/content/content_renderer.gypi
@@ -71,6 +71,10 @@
         'renderer/media/video_capture_impl.h',
         'renderer/media/video_capture_impl_manager.cc',
         'renderer/media/video_capture_impl_manager.h',
+        'renderer/media/video_capture_message_filter.cc',
+        'renderer/media/video_capture_message_filter.h',
+        'renderer/media/video_capture_message_filter_creator.cc',
+        'renderer/media/video_capture_message_filter_creator.h',
         'renderer/navigation_state.cc',
         'renderer/navigation_state.h',
         'renderer/notification_provider.cc',
@@ -139,10 +143,6 @@
         'renderer/speech_input_dispatcher.h',
         'renderer/v8_value_converter.cc',
         'renderer/v8_value_converter.h',
-        'renderer/video_capture_message_filter.cc',
-        'renderer/video_capture_message_filter.h',
-        'renderer/video_capture_message_filter_creator.cc',
-        'renderer/video_capture_message_filter_creator.h',
         'renderer/webplugin_delegate_proxy.cc',
         'renderer/webplugin_delegate_proxy.h',
         'renderer/websharedworker_proxy.cc',
diff --git a/content/renderer/media/OWNERS b/content/renderer/media/OWNERS
index bfa2f96..d37c12f 100644
--- a/content/renderer/media/OWNERS
+++ b/content/renderer/media/OWNERS
@@ -6,3 +6,4 @@ imasaki@chromium.org
 scherkus@chromium.org
 sjl@chromium.org
 vrk@chromium.org
+wjia@chromium.org
diff --git a/content/renderer/media/video_capture_impl.h b/content/renderer/media/video_capture_impl.h
index 2d5e49d..10ee056 100644
--- a/content/renderer/media/video_capture_impl.h
+++ b/content/renderer/media/video_capture_impl.h
@@ -12,7 +12,7 @@
 #include <list>
 #include <map>
 
-#include "content/renderer/video_capture_message_filter.h"
+#include "content/renderer/media/video_capture_message_filter.h"
 #include "media/video/capture/video_capture.h"
 #include "ui/gfx/surface/transport_dib.h"
 
diff --git a/content/renderer/media/video_capture_impl_manager.cc b/content/renderer/media/video_capture_impl_manager.cc
index 9985d75..62b3915 100644
--- a/content/renderer/media/video_capture_impl_manager.cc
+++ b/content/renderer/media/video_capture_impl_manager.cc
@@ -5,7 +5,7 @@
 #include "content/renderer/media/video_capture_impl_manager.h"
 
 #include "base/memory/singleton.h"
-#include "content/renderer/video_capture_message_filter_creator.h"
+#include "content/renderer/media/video_capture_message_filter_creator.h"
 #include "media/base/message_loop_factory_impl.h"
 
 VideoCaptureImplManager::VideoCaptureImplManager() {
diff --git a/content/renderer/media/video_capture_impl_manager.h b/content/renderer/media/video_capture_impl_manager.h
index f6f46d0..c562740 100644
--- a/content/renderer/media/video_capture_impl_manager.h
+++ b/content/renderer/media/video_capture_impl_manager.h
@@ -16,7 +16,7 @@
 #include "base/message_loop_proxy.h"
 #include "base/synchronization/lock.h"
 #include "content/renderer/media/video_capture_impl.h"
-#include "content/renderer/video_capture_message_filter.h"
+#include "content/renderer/media/video_capture_message_filter.h"
 #include "media/base/callback.h"
 #include "media/base/message_loop_factory.h"
 #include "media/video/capture/video_capture.h"
diff --git a/content/renderer/video_capture_message_filter.cc b/content/renderer/media/video_capture_message_filter.cc
index bfb8d87..9d8d50b 100644
--- a/content/renderer/video_capture_message_filter.cc
+++ b/content/renderer/media/video_capture_message_filter.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 "content/renderer/video_capture_message_filter.h"
+#include "content/renderer/media/video_capture_message_filter.h"
 
 #include "content/common/video_capture_messages.h"
 #include "content/common/view_messages.h"
diff --git a/content/renderer/video_capture_message_filter.h b/content/renderer/media/video_capture_message_filter.h
index 8fb8d65..5074039 100644
--- a/content/renderer/video_capture_message_filter.h
+++ b/content/renderer/media/video_capture_message_filter.h
@@ -7,8 +7,8 @@
 // render process. It intercepts video capture messages and process them on
 // IO thread since these messages are time critical.
 
-#ifndef CONTENT_RENDERER_VIDEO_CAPTURE_MESSAGE_FILTER_H_
-#define CONTENT_RENDERER_VIDEO_CAPTURE_MESSAGE_FILTER_H_
+#ifndef CONTENT_RENDERER_MEDIA_VIDEO_CAPTURE_MESSAGE_FILTER_H_
+#define CONTENT_RENDERER_MEDIA_VIDEO_CAPTURE_MESSAGE_FILTER_H_
 
 #include <map>
 
@@ -100,4 +100,4 @@ class VideoCaptureMessageFilter : public IPC::ChannelProxy::MessageFilter {
   DISALLOW_COPY_AND_ASSIGN(VideoCaptureMessageFilter);
 };
 
-#endif  // CONTENT_RENDERER_VIDEO_CAPTURE_MESSAGE_FILTER_H_
+#endif  // CONTENT_RENDERER_MEDIA_VIDEO_CAPTURE_MESSAGE_FILTER_H_
diff --git a/content/renderer/video_capture_message_filter_creator.cc b/content/renderer/media/video_capture_message_filter_creator.cc
index 8535f34..569f0c6 100644
--- a/content/renderer/video_capture_message_filter_creator.cc
+++ b/content/renderer/media/video_capture_message_filter_creator.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/renderer/video_capture_message_filter_creator.h"
+#include "content/renderer/media/video_capture_message_filter_creator.h"
 
-#include "content/renderer/video_capture_message_filter.h"
+#include "content/renderer/media/video_capture_message_filter.h"
 
 VideoCaptureMessageFilterCreator::VideoCaptureMessageFilterCreator() {
   filter_ = new VideoCaptureMessageFilter(1);
diff --git a/content/renderer/video_capture_message_filter_creator.h b/content/renderer/media/video_capture_message_filter_creator.h
index 149dd74..1424408 100644
--- a/content/renderer/video_capture_message_filter_creator.h
+++ b/content/renderer/media/video_capture_message_filter_creator.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 CONTENT_RENDERER_VIDEO_CAPTURE_MESSAGE_FILTER_CREATOR_H_
-#define CONTENT_RENDERER_VIDEO_CAPTURE_MESSAGE_FILTER_CREATOR_H_
+#ifndef CONTENT_RENDERER_MEDIA_VIDEO_CAPTURE_MESSAGE_FILTER_CREATOR_H_
+#define CONTENT_RENDERER_MEDIA_VIDEO_CAPTURE_MESSAGE_FILTER_CREATOR_H_
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/singleton.h"
@@ -31,5 +31,5 @@ class VideoCaptureMessageFilterCreator {
   DISALLOW_COPY_AND_ASSIGN(VideoCaptureMessageFilterCreator);
 };
 
-#endif  // CONTENT_RENDERER_VIDEO_CAPTURE_MESSAGE_FILTER_CREATOR_H_
+#endif  // CONTENT_RENDERER_MEDIA_VIDEO_CAPTURE_MESSAGE_FILTER_CREATOR_H_
 
diff --git a/content/renderer/video_capture_message_filter_unittest.cc b/content/renderer/media/video_capture_message_filter_unittest.cc
index 99dbeba..53717bc 100644
--- a/content/renderer/video_capture_message_filter_unittest.cc
+++ b/content/renderer/media/video_capture_message_filter_unittest.cc
@@ -5,7 +5,7 @@
 #include "base/message_loop.h"
 #include "base/shared_memory.h"
 #include "content/common/video_capture_messages.h"
-#include "content/renderer/video_capture_message_filter.h"
+#include "content/renderer/media/video_capture_message_filter.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
diff --git a/content/renderer/render_thread.cc b/content/renderer/render_thread.cc
index 3d9fc8b..dd8edae 100644
--- a/content/renderer/render_thread.cc
+++ b/content/renderer/render_thread.cc
@@ -37,6 +37,8 @@
 #include "content/renderer/gpu/gpu_channel_host.h"
 #include "content/renderer/gpu/gpu_video_service_host.h"
 #include "content/renderer/indexed_db_dispatcher.h"
+#include "content/renderer/media/video_capture_message_filter.h"
+#include "content/renderer/media/video_capture_message_filter_creator.h"
 #include "content/renderer/plugin_channel_host.h"
 #include "content/renderer/render_process_impl.h"
 #include "content/renderer/render_process_observer.h"
@@ -44,8 +46,6 @@
 #include "content/renderer/render_view_visitor.h"
 #include "content/renderer/renderer_webidbfactory_impl.h"
 #include "content/renderer/renderer_webkitclient_impl.h"
-#include "content/renderer/video_capture_message_filter.h"
-#include "content/renderer/video_capture_message_filter_creator.h"
 #include "ipc/ipc_channel_handle.h"
 #include "ipc/ipc_platform_file.h"
 #include "net/base/net_errors.h"