Fixit: Move tab and desktop capture code to new location.

The purpose of this change is to remove a layering violation: Code in content/browser/renderer_host should not depend on content/browser/web_contents.  As a secondary benefit, the code modules have been consolidated into a more-appropriate location, with cleaner DEPS/OWNERS files.

There are NO CODE CHANGES being made here, other than include's and ifdef guards in .h files.

BUG=178495
R=fbarchard@chromium.org, jam@chromium.org, scherkus@chromium.org

Review URL: https://codereview.chromium.org/172003004

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

39 files changed, 96 insertions, 114 deletions

diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc
index 3376aeb..d569188 100644
--- a/content/browser/browser_main_loop.cc
+++ b/content/browser/browser_main_loop.cc
@@ -34,10 +34,10 @@
 #include "content/browser/gpu/gpu_process_host_ui_shim.h"
 #include "content/browser/histogram_synchronizer.h"
 #include "content/browser/loader/resource_dispatcher_host_impl.h"
+#include "content/browser/media/capture/audio_mirroring_manager.h"
 #include "content/browser/media/media_internals.h"
 #include "content/browser/net/browser_online_state_observer.h"
 #include "content/browser/plugin_service_impl.h"
-#include "content/browser/renderer_host/media/audio_mirroring_manager.h"
 #include "content/browser/renderer_host/media/media_stream_manager.h"
 #include "content/browser/renderer_host/render_process_host_impl.h"
 #include "content/browser/speech/speech_recognition_manager_impl.h"
diff --git a/content/browser/media/capture/DEPS b/content/browser/media/capture/DEPS
new file mode 100644
index 0000000..c88063c
--- /dev/null
+++ b/content/browser/media/capture/DEPS
@@ -0,0 +1,3 @@
+include_rules = [
+  "+third_party/libyuv",  # For scaling in desktop_capture_device.cc.
+]
diff --git a/content/browser/media/capture/OWNERS b/content/browser/media/capture/OWNERS
new file mode 100644
index 0000000..063a202
--- /dev/null
+++ b/content/browser/media/capture/OWNERS
@@ -0,0 +1,4 @@
+hclam@chromium.org
+miu@chromium.org
+sergeyu@chromium.org
+wez@chromium.org
diff --git a/content/browser/renderer_host/media/audio_mirroring_manager.cc b/content/browser/media/capture/audio_mirroring_manager.cc
index 8a2bc4b..b8051fa 100644
--- a/content/browser/renderer_host/media/audio_mirroring_manager.cc
+++ b/content/browser/media/capture/audio_mirroring_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/renderer_host/media/audio_mirroring_manager.h"
+#include "content/browser/media/capture/audio_mirroring_manager.h"
 
 #include "content/public/browser/browser_thread.h"
 
diff --git a/content/browser/renderer_host/media/audio_mirroring_manager.h b/content/browser/media/capture/audio_mirroring_manager.h
index 0db4f17..fe7db7a 100644
--- a/content/browser/renderer_host/media/audio_mirroring_manager.h
+++ b/content/browser/media/capture/audio_mirroring_manager.h
@@ -24,8 +24,8 @@
 // #2 and #3 above may occur in any order, as it is the job of
 // AudioMirroringManager to realize when the players can be "matched up."
 
-#ifndef CONTENT_BROWSER_RENDERER_HOST_MEDIA_AUDIO_MIRRORING_MANAGER_H_
-#define CONTENT_BROWSER_RENDERER_HOST_MEDIA_AUDIO_MIRRORING_MANAGER_H_
+#ifndef CONTENT_BROWSER_MEDIA_CAPTURE_AUDIO_MIRRORING_MANAGER_H_
+#define CONTENT_BROWSER_MEDIA_CAPTURE_AUDIO_MIRRORING_MANAGER_H_
 
 #include <map>
 #include <utility>
@@ -105,4 +105,4 @@ class CONTENT_EXPORT AudioMirroringManager {
 
 }  // namespace content
 
-#endif  // CONTENT_BROWSER_RENDERER_HOST_MEDIA_AUDIO_MIRRORING_MANAGER_H_
+#endif  // CONTENT_BROWSER_MEDIA_CAPTURE_AUDIO_MIRRORING_MANAGER_H_
diff --git a/content/browser/renderer_host/media/audio_mirroring_manager_unittest.cc b/content/browser/media/capture/audio_mirroring_manager_unittest.cc
index 2ffd8974..cd19776 100644
--- a/content/browser/renderer_host/media/audio_mirroring_manager_unittest.cc
+++ b/content/browser/media/capture/audio_mirroring_manager_unittest.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/media/audio_mirroring_manager.h"
+#include "content/browser/media/capture/audio_mirroring_manager.h"
 
 #include <map>
 
diff --git a/content/browser/renderer_host/media/content_video_capture_device_core.cc b/content/browser/media/capture/content_video_capture_device_core.cc
index f710134..52dfd38 100644
--- a/content/browser/renderer_host/media/content_video_capture_device_core.cc
+++ b/content/browser/media/capture/content_video_capture_device_core.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/media/content_video_capture_device_core.h"
+#include "content/browser/media/capture/content_video_capture_device_core.h"
 
 #include "base/basictypes.h"
 #include "base/bind.h"
diff --git a/content/browser/renderer_host/media/content_video_capture_device_core.h b/content/browser/media/capture/content_video_capture_device_core.h
index 1a2b8df..c8c69c8 100644
--- a/content/browser/renderer_host/media/content_video_capture_device_core.h
+++ b/content/browser/media/capture/content_video_capture_device_core.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_CONTENT_VIDEO_CAPTURE_DEVICE_CORE_H_
-#define CONTENT_BROWSER_RENDERER_CONTENT_VIDEO_CAPTURE_DEVICE_CORE_H_
+#ifndef CONTENT_BROWSER_MEDIA_CAPTURE_CONTENT_VIDEO_CAPTURE_DEVICE_CORE_H_
+#define CONTENT_BROWSER_MEDIA_CAPTURE_CONTENT_VIDEO_CAPTURE_DEVICE_CORE_H_
 
 #include <string>
 
@@ -11,7 +11,7 @@
 #include "base/memory/weak_ptr.h"
 #include "base/threading/thread.h"
 #include "base/threading/thread_checker.h"
-#include "content/browser/renderer_host/media/video_capture_oracle.h"
+#include "content/browser/media/capture/video_capture_oracle.h"
 #include "content/common/content_export.h"
 #include "media/video/capture/video_capture_device.h"
 
@@ -194,4 +194,4 @@ class CONTENT_EXPORT ContentVideoCaptureDeviceCore
 
 }  // namespace content
 
-#endif  // CONTENT_BROWSER_RENDERER_CONTENT_VIDEO_CAPTURE_DEVICE_CORE_H_
+#endif  // CONTENT_BROWSER_MEDIA_CAPTURE_CONTENT_VIDEO_CAPTURE_DEVICE_CORE_H_
diff --git a/content/browser/renderer_host/media/desktop_capture_device.cc b/content/browser/media/capture/desktop_capture_device.cc
index 74ecd80..658283d 100644
--- a/content/browser/renderer_host/media/desktop_capture_device.cc
+++ b/content/browser/media/capture/desktop_capture_device.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/media/desktop_capture_device.h"
+#include "content/browser/media/capture/desktop_capture_device.h"
 
 #include "base/bind.h"
 #include "base/location.h"
diff --git a/content/browser/renderer_host/media/desktop_capture_device.h b/content/browser/media/capture/desktop_capture_device.h
index b418a29..9e6eaff 100644
--- a/content/browser/renderer_host/media/desktop_capture_device.h
+++ b/content/browser/media/capture/desktop_capture_device.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_MEDIA_DESKTOP_CAPTURE_DEVICE_H_
-#define CONTENT_BROWSER_RENDERER_HOST_MEDIA_DESKTOP_CAPTURE_DEVICE_H_
+#ifndef CONTENT_BROWSER_MEDIA_CAPTURE_DESKTOP_CAPTURE_DEVICE_H_
+#define CONTENT_BROWSER_MEDIA_CAPTURE_DESKTOP_CAPTURE_DEVICE_H_
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
@@ -51,4 +51,4 @@ class CONTENT_EXPORT DesktopCaptureDevice : public media::VideoCaptureDevice {
 
 }  // namespace content
 
-#endif  // CONTENT_BROWSER_RENDERER_HOST_MEDIA_DESKTOP_CAPTURE_DEVICE_H_
+#endif  // CONTENT_BROWSER_MEDIA_CAPTURE_DESKTOP_CAPTURE_DEVICE_H_
diff --git a/content/browser/renderer_host/media/desktop_capture_device_aura.cc b/content/browser/media/capture/desktop_capture_device_aura.cc
index 172088c..42cae93 100644
--- a/content/browser/renderer_host/media/desktop_capture_device_aura.cc
+++ b/content/browser/media/capture/desktop_capture_device_aura.cc
@@ -2,14 +2,14 @@
 // 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/media/desktop_capture_device_aura.h"
+#include "content/browser/media/capture/desktop_capture_device_aura.h"
 
 #include "base/logging.h"
 #include "base/timer/timer.h"
 #include "cc/output/copy_output_request.h"
 #include "cc/output/copy_output_result.h"
 #include "content/browser/compositor/image_transport_factory.h"
-#include "content/browser/renderer_host/media/content_video_capture_device_core.h"
+#include "content/browser/media/capture/content_video_capture_device_core.h"
 #include "content/common/gpu/client/gl_helper.h"
 #include "content/public/browser/browser_thread.h"
 #include "media/base/video_util.h"
diff --git a/content/browser/renderer_host/media/desktop_capture_device_aura.h b/content/browser/media/capture/desktop_capture_device_aura.h
index 92ddd72..997b3ce 100644
--- a/content/browser/renderer_host/media/desktop_capture_device_aura.h
+++ b/content/browser/media/capture/desktop_capture_device_aura.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_MEDIA_DESKTOP_CAPTURE_DEVICE_AURA_H_
-#define CONTENT_BROWSER_RENDERER_HOST_MEDIA_DESKTOP_CAPTURE_DEVICE_AURA_H_
+#ifndef CONTENT_BROWSER_MEDIA_CAPTURE_DESKTOP_CAPTURE_DEVICE_AURA_H_
+#define CONTENT_BROWSER_MEDIA_CAPTURE_DESKTOP_CAPTURE_DEVICE_AURA_H_
 
 #include <string>
 
@@ -45,4 +45,4 @@ class CONTENT_EXPORT DesktopCaptureDeviceAura
 
 }  // namespace content
 
-#endif  // CONTENT_BROWSER_RENDERER_HOST_MEDIA_DESKTOP_CAPTURE_DEVICE_AURA_H_
+#endif  // CONTENT_BROWSER_MEDIA_CAPTURE_DESKTOP_CAPTURE_DEVICE_AURA_H_
diff --git a/content/browser/renderer_host/media/desktop_capture_device_aura_unittest.cc b/content/browser/media/capture/desktop_capture_device_aura_unittest.cc
index 2481d8d..d15d957 100644
--- a/content/browser/renderer_host/media/desktop_capture_device_aura_unittest.cc
+++ b/content/browser/media/capture/desktop_capture_device_aura_unittest.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/media/desktop_capture_device_aura.h"
+#include "content/browser/media/capture/desktop_capture_device_aura.h"
 
 #include "base/synchronization/waitable_event.h"
 #include "content/browser/browser_thread_impl.h"
diff --git a/content/browser/renderer_host/media/desktop_capture_device_unittest.cc b/content/browser/media/capture/desktop_capture_device_unittest.cc
index c51172a..9089671 100644
--- a/content/browser/renderer_host/media/desktop_capture_device_unittest.cc
+++ b/content/browser/media/capture/desktop_capture_device_unittest.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/media/desktop_capture_device.h"
+#include "content/browser/media/capture/desktop_capture_device.h"
 
 #include "base/basictypes.h"
 #include "base/sequenced_task_runner.h"
diff --git a/content/browser/renderer_host/media/video_capture_oracle.cc b/content/browser/media/capture/video_capture_oracle.cc
index 499bde4..dfe86f4 100644
--- a/content/browser/renderer_host/media/video_capture_oracle.cc
+++ b/content/browser/media/capture/video_capture_oracle.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/media/video_capture_oracle.h"
+#include "content/browser/media/capture/video_capture_oracle.h"
 
 #include "base/debug/trace_event.h"
 
diff --git a/content/browser/renderer_host/media/video_capture_oracle.h b/content/browser/media/capture/video_capture_oracle.h
index c14d16f..6242b6a 100644
--- a/content/browser/renderer_host/media/video_capture_oracle.h
+++ b/content/browser/media/capture/video_capture_oracle.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_MEDIA_VIDEO_CAPTURE_ORACLE_H_
-#define CONTENT_BROWSER_RENDERER_HOST_MEDIA_VIDEO_CAPTURE_ORACLE_H_
+#ifndef CONTENT_BROWSER_MEDIA_CAPTURE_VIDEO_CAPTURE_ORACLE_H_
+#define CONTENT_BROWSER_MEDIA_CAPTURE_VIDEO_CAPTURE_ORACLE_H_
 
 #include "base/callback_forward.h"
 #include "base/memory/scoped_ptr.h"
@@ -102,4 +102,4 @@ class CONTENT_EXPORT VideoCaptureOracle {
 
 }  // namespace content
 
-#endif  // CONTENT_BROWSER_RENDERER_HOST_MEDIA_VIDEO_CAPTURE_ORACLE_H_
+#endif  // CONTENT_BROWSER_MEDIA_CAPTURE_VIDEO_CAPTURE_ORACLE_H_
diff --git a/content/browser/renderer_host/media/video_capture_oracle_unittest.cc b/content/browser/media/capture/video_capture_oracle_unittest.cc
index 22e2dda..dff8e97 100644
--- a/content/browser/renderer_host/media/video_capture_oracle_unittest.cc
+++ b/content/browser/media/capture/video_capture_oracle_unittest.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/media/video_capture_oracle.h"
+#include "content/browser/media/capture/video_capture_oracle.h"
 
 #include "base/strings/stringprintf.h"
 #include "base/time/time.h"
diff --git a/content/browser/renderer_host/media/web_contents_audio_input_stream.cc b/content/browser/media/capture/web_contents_audio_input_stream.cc
index e559be2..ad5a33f 100644
--- a/content/browser/renderer_host/media/web_contents_audio_input_stream.cc
+++ b/content/browser/media/capture/web_contents_audio_input_stream.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/media/web_contents_audio_input_stream.h"
+#include "content/browser/media/capture/web_contents_audio_input_stream.h"
 
 #include <string>
 
@@ -11,9 +11,9 @@
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/threading/thread_checker.h"
-#include "content/browser/renderer_host/media/audio_mirroring_manager.h"
-#include "content/browser/renderer_host/media/web_contents_capture_util.h"
-#include "content/browser/renderer_host/media/web_contents_tracker.h"
+#include "content/browser/media/capture/audio_mirroring_manager.h"
+#include "content/browser/media/capture/web_contents_capture_util.h"
+#include "content/browser/media/capture/web_contents_tracker.h"
 #include "content/public/browser/browser_thread.h"
 #include "media/audio/virtual_audio_input_stream.h"
 #include "media/audio/virtual_audio_output_stream.h"
diff --git a/content/browser/renderer_host/media/web_contents_audio_input_stream.h b/content/browser/media/capture/web_contents_audio_input_stream.h
index cd50353..c0a2c6a 100644
--- a/content/browser/renderer_host/media/web_contents_audio_input_stream.h
+++ b/content/browser/media/capture/web_contents_audio_input_stream.h
@@ -13,8 +13,8 @@
 // navigation, crash/reload, etc. events; and take appropriate actions to
 // provide a seamless, uninterrupted mirroring experience.
 
-#ifndef CONTENT_BROWSER_RENDERER_HOST_MEDIA_WEB_CONTENTS_AUDIO_INPUT_STREAM_H_
-#define CONTENT_BROWSER_RENDERER_HOST_MEDIA_WEB_CONTENTS_AUDIO_INPUT_STREAM_H_
+#ifndef CONTENT_BROWSER_MEDIA_CAPTURE_WEB_CONTENTS_AUDIO_INPUT_STREAM_H_
+#define CONTENT_BROWSER_MEDIA_CAPTURE_WEB_CONTENTS_AUDIO_INPUT_STREAM_H_
 
 #include <string>
 
@@ -89,4 +89,4 @@ class CONTENT_EXPORT WebContentsAudioInputStream
 
 }  // namespace content
 
-#endif  // CONTENT_BROWSER_RENDERER_HOST_MEDIA_WEB_CONTENTS_AUDIO_INPUT_STREAM_H_
+#endif  // CONTENT_BROWSER_MEDIA_CAPTURE_WEB_CONTENTS_AUDIO_INPUT_STREAM_H_
diff --git a/content/browser/renderer_host/media/web_contents_audio_input_stream_unittest.cc b/content/browser/media/capture/web_contents_audio_input_stream_unittest.cc
index 4a782aa..c9afbf1 100644
--- a/content/browser/renderer_host/media/web_contents_audio_input_stream_unittest.cc
+++ b/content/browser/media/capture/web_contents_audio_input_stream_unittest.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/media/web_contents_audio_input_stream.h"
+#include "content/browser/media/capture/web_contents_audio_input_stream.h"
 
 #include <list>
 
@@ -12,8 +12,8 @@
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/thread.h"
 #include "content/browser/browser_thread_impl.h"
-#include "content/browser/renderer_host/media/audio_mirroring_manager.h"
-#include "content/browser/renderer_host/media/web_contents_tracker.h"
+#include "content/browser/media/capture/audio_mirroring_manager.h"
+#include "content/browser/media/capture/web_contents_tracker.h"
 #include "media/audio/simple_sources.h"
 #include "media/audio/virtual_audio_input_stream.h"
 #include "testing/gmock/include/gmock/gmock.h"
diff --git a/content/browser/renderer_host/media/web_contents_capture_util.cc b/content/browser/media/capture/web_contents_capture_util.cc
index 28b0fa6..57b636a 100644
--- a/content/browser/renderer_host/media/web_contents_capture_util.cc
+++ b/content/browser/media/capture/web_contents_capture_util.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/media/web_contents_capture_util.h"
+#include "content/browser/media/capture/web_contents_capture_util.h"
 
 #include "base/basictypes.h"
 #include "base/strings/string_number_conversions.h"
diff --git a/content/browser/renderer_host/media/web_contents_capture_util.h b/content/browser/media/capture/web_contents_capture_util.h
index 8f376af..5f43f42 100644
--- a/content/browser/renderer_host/media/web_contents_capture_util.h
+++ b/content/browser/media/capture/web_contents_capture_util.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_MEDIA_WEB_CONTENTS_CAPTURE_UTIL_H_
-#define CONTENT_BROWSER_RENDERER_HOST_MEDIA_WEB_CONTENTS_CAPTURE_UTIL_H_
+#ifndef CONTENT_BROWSER_MEDIA_CAPTURE_WEB_CONTENTS_CAPTURE_UTIL_H_
+#define CONTENT_BROWSER_MEDIA_CAPTURE_WEB_CONTENTS_CAPTURE_UTIL_H_
 
 #include <string>
 
@@ -32,4 +32,4 @@ class CONTENT_EXPORT WebContentsCaptureUtil {
 
 }  // namespace content
 
-#endif  // CONTENT_BROWSER_RENDERER_HOST_MEDIA_WEB_CONTENTS_CAPTURE_UTIL_H_
+#endif  // CONTENT_BROWSER_MEDIA_CAPTURE_WEB_CONTENTS_CAPTURE_UTIL_H_
diff --git a/content/browser/renderer_host/media/web_contents_tracker.cc b/content/browser/media/capture/web_contents_tracker.cc
index 3a75080..0251c64 100644
--- a/content/browser/renderer_host/media/web_contents_tracker.cc
+++ b/content/browser/media/capture/web_contents_tracker.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/media/web_contents_tracker.h"
+#include "content/browser/media/capture/web_contents_tracker.h"
 
 #include "base/message_loop/message_loop_proxy.h"
 #include "content/public/browser/browser_thread.h"
diff --git a/content/browser/renderer_host/media/web_contents_tracker.h b/content/browser/media/capture/web_contents_tracker.h
index 632ced2..0c77761 100644
--- a/content/browser/renderer_host/media/web_contents_tracker.h
+++ b/content/browser/media/capture/web_contents_tracker.h
@@ -12,8 +12,8 @@
 // same thread.  This can be any thread, and the decision is locked-in by
 // WebContentsTracker when Start() is called.
 
-#ifndef CONTENT_BROWSER_RENDERER_HOST_MEDIA_WEB_CONTENTS_TRACKER_H_
-#define CONTENT_BROWSER_RENDERER_HOST_MEDIA_WEB_CONTENTS_TRACKER_H_
+#ifndef CONTENT_BROWSER_MEDIA_CAPTURE_WEB_CONTENTS_TRACKER_H_
+#define CONTENT_BROWSER_MEDIA_CAPTURE_WEB_CONTENTS_TRACKER_H_
 
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
@@ -83,4 +83,4 @@ class CONTENT_EXPORT WebContentsTracker
 
 }  // namespace content
 
-#endif  // CONTENT_BROWSER_RENDERER_HOST_MEDIA_WEB_CONTENTS_TRACKER_H_
+#endif  // CONTENT_BROWSER_MEDIA_CAPTURE_WEB_CONTENTS_TRACKER_H_
diff --git a/content/browser/renderer_host/media/web_contents_video_capture_device.cc b/content/browser/media/capture/web_contents_video_capture_device.cc
index 6e33465..093703e 100644
--- a/content/browser/renderer_host/media/web_contents_video_capture_device.cc
+++ b/content/browser/media/capture/web_contents_video_capture_device.cc
@@ -48,7 +48,7 @@
 // Turning on verbose logging will cause the effective frame rate to be logged
 // at 5-second intervals.
 
-#include "content/browser/renderer_host/media/web_contents_video_capture_device.h"
+#include "content/browser/media/capture/web_contents_video_capture_device.h"
 
 #include "base/basictypes.h"
 #include "base/bind.h"
@@ -62,9 +62,9 @@
 #include "base/threading/thread.h"
 #include "base/threading/thread_checker.h"
 #include "base/time/time.h"
-#include "content/browser/renderer_host/media/content_video_capture_device_core.h"
-#include "content/browser/renderer_host/media/video_capture_oracle.h"
-#include "content/browser/renderer_host/media/web_contents_capture_util.h"
+#include "content/browser/media/capture/content_video_capture_device_core.h"
+#include "content/browser/media/capture/video_capture_oracle.h"
+#include "content/browser/media/capture/web_contents_capture_util.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/port/browser/render_widget_host_view_frame_subscriber.h"
diff --git a/content/browser/renderer_host/media/web_contents_video_capture_device.h b/content/browser/media/capture/web_contents_video_capture_device.h
index 1e3dd4d..3e8805b4 100644
--- a/content/browser/renderer_host/media/web_contents_video_capture_device.h
+++ b/content/browser/media/capture/web_contents_video_capture_device.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_MEDIA_WEB_CONTENTS_VIDEO_CAPTURE_DEVICE_H_
-#define CONTENT_BROWSER_RENDERER_HOST_MEDIA_WEB_CONTENTS_VIDEO_CAPTURE_DEVICE_H_
+#ifndef CONTENT_BROWSER_MEDIA_CAPTURE_WEB_CONTENTS_VIDEO_CAPTURE_DEVICE_H_
+#define CONTENT_BROWSER_MEDIA_CAPTURE_WEB_CONTENTS_VIDEO_CAPTURE_DEVICE_H_
 
 #include <string>
 
@@ -57,4 +57,4 @@ class CONTENT_EXPORT WebContentsVideoCaptureDevice
 
 }  // namespace content
 
-#endif  // CONTENT_BROWSER_RENDERER_HOST_MEDIA_WEB_CONTENTS_VIDEO_CAPTURE_DEVICE_H_
+#endif  // CONTENT_BROWSER_MEDIA_CAPTURE_WEB_CONTENTS_VIDEO_CAPTURE_DEVICE_H_
diff --git a/content/browser/renderer_host/media/web_contents_video_capture_device_unittest.cc b/content/browser/media/capture/web_contents_video_capture_device_unittest.cc
index 5787d2b..54cd1f5 100644
--- a/content/browser/renderer_host/media/web_contents_video_capture_device_unittest.cc
+++ b/content/browser/media/capture/web_contents_video_capture_device_unittest.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/media/web_contents_video_capture_device.h"
+#include "content/browser/media/capture/web_contents_video_capture_device.h"
 
 #include "base/bind_helpers.h"
 #include "base/debug/debugger.h"
@@ -11,9 +11,9 @@
 #include "base/time/time.h"
 #include "base/timer/timer.h"
 #include "content/browser/browser_thread_impl.h"
+#include "content/browser/media/capture/video_capture_oracle.h"
+#include "content/browser/media/capture/web_contents_capture_util.h"
 #include "content/browser/renderer_host/media/video_capture_buffer_pool.h"
-#include "content/browser/renderer_host/media/video_capture_oracle.h"
-#include "content/browser/renderer_host/media/web_contents_capture_util.h"
 #include "content/browser/renderer_host/render_view_host_factory.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/port/browser/render_widget_host_view_frame_subscriber.h"
diff --git a/content/browser/renderer_host/media/DEPS b/content/browser/renderer_host/media/DEPS
index 6f4140f..c3a5b96 100644
--- a/content/browser/renderer_host/media/DEPS
+++ b/content/browser/renderer_host/media/DEPS
@@ -1,9 +1,3 @@
 include_rules = [
   "+media",
-  
-  # TODO: this is temporary, this directory doesn't belong under renderer_host
-  # since it depends on web_contents.
-  "+content/browser/web_contents",
-  "+content/public/browser/web_contents.h",
-  "+content/public/browser/web_contents_view.h",
 ]
diff --git a/content/browser/renderer_host/media/OWNERS b/content/browser/renderer_host/media/OWNERS
index bc20fb9a..d132d0e 100644
--- a/content/browser/renderer_host/media/OWNERS
+++ b/content/browser/renderer_host/media/OWNERS
@@ -9,21 +9,3 @@ vrk@chromium.org
 wjia@chromium.org
 xhwang@chromium.org
 xians@chromium.org
-
-# Tab capture OWNERS.
-per-file audio*=miu@chromium.org
-per-file web_contents*=hclam@chromium.org
-per-file web_contents*=justinlin@chromium.org
-per-file web_contents*=miu@chromium.org
-per-file web_contents*=nick@chromium.org
-per-file video_capture_device_impl*=hclam@chromium.org
-per-file video_capture_device_impl*=miu@chromium.org
-per-file video_capture_device_impl*=nick@chromium.org
-per-file video_capture_oracle*=hclam@chromium.org
-per-file video_capture_oracle*=justinlin@chromium.org
-per-file video_capture_oracle*=miu@chromium.org
-per-file video_capture_oracle*=nick@chromium.org
-
-# Screen capture OWNERS.
-per-file desktop_capture_*=sergeyu@chromium.org
-per-file desktop_capture_*=wez@chromium.org
diff --git a/content/browser/renderer_host/media/audio_input_renderer_host.cc b/content/browser/renderer_host/media/audio_input_renderer_host.cc
index 6a75f54..00a704f3 100644
--- a/content/browser/renderer_host/media/audio_input_renderer_host.cc
+++ b/content/browser/renderer_host/media/audio_input_renderer_host.cc
@@ -8,12 +8,12 @@
 #include "base/memory/shared_memory.h"
 #include "base/metrics/histogram.h"
 #include "base/process/process.h"
+#include "content/browser/media/capture/web_contents_audio_input_stream.h"
+#include "content/browser/media/capture/web_contents_capture_util.h"
 #include "content/browser/media/media_internals.h"
 #include "content/browser/renderer_host/media/audio_input_device_manager.h"
 #include "content/browser/renderer_host/media/audio_input_sync_writer.h"
 #include "content/browser/renderer_host/media/media_stream_manager.h"
-#include "content/browser/renderer_host/media/web_contents_audio_input_stream.h"
-#include "content/browser/renderer_host/media/web_contents_capture_util.h"
 #include "media/audio/audio_manager_base.h"
 
 namespace content {
diff --git a/content/browser/renderer_host/media/audio_renderer_host.cc b/content/browser/renderer_host/media/audio_renderer_host.cc
index a1f3710..46eb0e7 100644
--- a/content/browser/renderer_host/media/audio_renderer_host.cc
+++ b/content/browser/renderer_host/media/audio_renderer_host.cc
@@ -10,9 +10,9 @@
 #include "base/metrics/histogram.h"
 #include "base/process/process.h"
 #include "content/browser/browser_main_loop.h"
+#include "content/browser/media/capture/audio_mirroring_manager.h"
 #include "content/browser/media/media_internals.h"
 #include "content/browser/renderer_host/media/audio_input_device_manager.h"
-#include "content/browser/renderer_host/media/audio_mirroring_manager.h"
 #include "content/browser/renderer_host/media/audio_sync_reader.h"
 #include "content/browser/renderer_host/media/media_stream_manager.h"
 #include "content/common/media/audio_messages.h"
diff --git a/content/browser/renderer_host/media/audio_renderer_host_unittest.cc b/content/browser/renderer_host/media/audio_renderer_host_unittest.cc
index ff7d4b8..88d3fcd 100644
--- a/content/browser/renderer_host/media/audio_renderer_host_unittest.cc
+++ b/content/browser/renderer_host/media/audio_renderer_host_unittest.cc
@@ -6,9 +6,9 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/run_loop.h"
 #include "base/sync_socket.h"
+#include "content/browser/media/capture/audio_mirroring_manager.h"
 #include "content/browser/media/media_internals.h"
 #include "content/browser/renderer_host/media/audio_input_device_manager.h"
-#include "content/browser/renderer_host/media/audio_mirroring_manager.h"
 #include "content/browser/renderer_host/media/audio_renderer_host.h"
 #include "content/browser/renderer_host/media/media_stream_manager.h"
 #include "content/common/media/audio_messages.h"
diff --git a/content/browser/renderer_host/media/media_stream_dispatcher_host.cc b/content/browser/renderer_host/media/media_stream_dispatcher_host.cc
index 2385f3b..a357e59 100644
--- a/content/browser/renderer_host/media/media_stream_dispatcher_host.cc
+++ b/content/browser/renderer_host/media/media_stream_dispatcher_host.cc
@@ -5,7 +5,6 @@
 #include "content/browser/renderer_host/media/media_stream_dispatcher_host.h"
 
 #include "content/browser/browser_main_loop.h"
-#include "content/browser/renderer_host/media/web_contents_capture_util.h"
 #include "content/common/media/media_stream_messages.h"
 #include "content/common/media/media_stream_options.h"
 #include "url/gurl.h"
diff --git a/content/browser/renderer_host/media/media_stream_manager.cc b/content/browser/renderer_host/media/media_stream_manager.cc
index 26aa2b6..14c0d4d 100644
--- a/content/browser/renderer_host/media/media_stream_manager.cc
+++ b/content/browser/renderer_host/media/media_stream_manager.cc
@@ -16,12 +16,12 @@
 #include "base/strings/stringprintf.h"
 #include "base/threading/thread.h"
 #include "content/browser/browser_main_loop.h"
+#include "content/browser/media/capture/web_contents_capture_util.h"
 #include "content/browser/renderer_host/media/audio_input_device_manager.h"
 #include "content/browser/renderer_host/media/device_request_message_filter.h"
 #include "content/browser/renderer_host/media/media_stream_requester.h"
 #include "content/browser/renderer_host/media/media_stream_ui_proxy.h"
 #include "content/browser/renderer_host/media/video_capture_manager.h"
-#include "content/browser/renderer_host/media/web_contents_capture_util.h"
 #include "content/browser/renderer_host/render_process_host_impl.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/content_browser_client.h"
diff --git a/content/browser/renderer_host/media/video_capture_manager.cc b/content/browser/renderer_host/media/video_capture_manager.cc
index a547037..54ad96e 100644
--- a/content/browser/renderer_host/media/video_capture_manager.cc
+++ b/content/browser/renderer_host/media/video_capture_manager.cc
@@ -13,9 +13,9 @@
 #include "base/stl_util.h"
 #include "base/task_runner_util.h"
 #include "base/threading/sequenced_worker_pool.h"
+#include "content/browser/media/capture/web_contents_video_capture_device.h"
 #include "content/browser/renderer_host/media/video_capture_controller.h"
 #include "content/browser/renderer_host/media/video_capture_controller_event_handler.h"
-#include "content/browser/renderer_host/media/web_contents_video_capture_device.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/desktop_media_id.h"
 #include "content/public/common/content_switches.h"
@@ -27,9 +27,9 @@
 #include "media/video/capture/video_capture_device.h"
 
 #if defined(ENABLE_SCREEN_CAPTURE)
-#include "content/browser/renderer_host/media/desktop_capture_device.h"
+#include "content/browser/media/capture/desktop_capture_device.h"
 #if defined(USE_AURA)
-#include "content/browser/renderer_host/media/desktop_capture_device_aura.h"
+#include "content/browser/media/capture/desktop_capture_device_aura.h"
 #endif
 #endif
 
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index f880863..14336b2 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -61,6 +61,7 @@
 #include "content/browser/loader/resource_message_filter.h"
 #include "content/browser/loader/resource_scheduler_filter.h"
 #include "content/browser/media/android/browser_demuxer_android.h"
+#include "content/browser/media/capture/audio_mirroring_manager.h"
 #include "content/browser/media/media_internals.h"
 #include "content/browser/message_port_message_filter.h"
 #include "content/browser/mime_registry_message_filter.h"
@@ -73,7 +74,6 @@
 #include "content/browser/renderer_host/gamepad_browser_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_mirroring_manager.h"
 #include "content/browser/renderer_host/media/audio_renderer_host.h"
 #include "content/browser/renderer_host/media/device_request_message_filter.h"
 #include "content/browser/renderer_host/media/media_stream_dispatcher_host.h"
diff --git a/content/content_browser.gypi b/content/content_browser.gypi
index 8a26785..d6023ea 100644
--- a/content/content_browser.gypi
+++ b/content/content_browser.gypi
@@ -733,6 +733,20 @@
     'browser/media/android/media_drm_credential_manager.h',
     'browser/media/android/media_resource_getter_impl.cc',
     'browser/media/android/media_resource_getter_impl.h',
+    'browser/media/capture/audio_mirroring_manager.cc',
+    'browser/media/capture/audio_mirroring_manager.h',
+    'browser/media/capture/content_video_capture_device_core.cc',
+    'browser/media/capture/content_video_capture_device_core.h',
+    'browser/media/capture/video_capture_oracle.cc',
+    'browser/media/capture/video_capture_oracle.h',
+    'browser/media/capture/web_contents_audio_input_stream.cc',
+    'browser/media/capture/web_contents_audio_input_stream.h',
+    'browser/media/capture/web_contents_capture_util.cc',
+    'browser/media/capture/web_contents_capture_util.h',
+    'browser/media/capture/web_contents_tracker.cc',
+    'browser/media/capture/web_contents_tracker.h',
+    'browser/media/capture/web_contents_video_capture_device.cc',
+    'browser/media/capture/web_contents_video_capture_device.h',
     'browser/media/media_devices_monitor.cc',
     'browser/media/media_internals.cc',
     'browser/media/media_internals.h',
@@ -934,14 +948,10 @@
     '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_mirroring_manager.cc',
-    'browser/renderer_host/media/audio_mirroring_manager.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/content_video_capture_device_core.cc',
-    'browser/renderer_host/media/content_video_capture_device_core.h',
     'browser/renderer_host/media/device_request_message_filter.cc',
     'browser/renderer_host/media/device_request_message_filter.h',
     'browser/renderer_host/media/media_stream_dispatcher_host.cc',
@@ -966,16 +976,6 @@
     '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/media/video_capture_oracle.cc',
-    'browser/renderer_host/media/video_capture_oracle.h',
-    'browser/renderer_host/media/web_contents_audio_input_stream.cc',
-    'browser/renderer_host/media/web_contents_audio_input_stream.h',
-    'browser/renderer_host/media/web_contents_capture_util.cc',
-    'browser/renderer_host/media/web_contents_capture_util.h',
-    'browser/renderer_host/media/web_contents_tracker.cc',
-    'browser/renderer_host/media/web_contents_tracker.h',
-    'browser/renderer_host/media/web_contents_video_capture_device.cc',
-    'browser/renderer_host/media/web_contents_video_capture_device.h',
     'browser/renderer_host/memory_benchmark_message_filter.cc',
     'browser/renderer_host/memory_benchmark_message_filter.h',
     'browser/renderer_host/native_web_keyboard_event.cc',
@@ -1412,10 +1412,10 @@
     }],
     ['enable_webrtc==1 and (OS=="linux" or OS=="mac" or OS=="win")', {
       'sources': [
-        'browser/renderer_host/media/desktop_capture_device.cc',
-        'browser/renderer_host/media/desktop_capture_device.h',
-        'browser/renderer_host/media/desktop_capture_device_aura.cc',
-        'browser/renderer_host/media/desktop_capture_device_aura.h',
+        'browser/media/capture/desktop_capture_device.cc',
+        'browser/media/capture/desktop_capture_device.h',
+        'browser/media/capture/desktop_capture_device_aura.cc',
+        'browser/media/capture/desktop_capture_device_aura.h',
       ],
       'dependencies': [
         '../third_party/webrtc/modules/modules.gyp:desktop_capture',
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index 27506e7..171583e 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -423,6 +423,10 @@
         'browser/loader/resource_scheduler_unittest.cc',
         'browser/loader/upload_data_stream_builder_unittest.cc',
         'browser/mach_broker_mac_unittest.cc',
+        'browser/media/capture/audio_mirroring_manager_unittest.cc',
+        'browser/media/capture/video_capture_oracle_unittest.cc',
+        'browser/media/capture/web_contents_audio_input_stream_unittest.cc',
+        'browser/media/capture/web_contents_video_capture_device_unittest.cc',
         'browser/media/media_internals_unittest.cc',
         'browser/media/webrtc_identity_store_unittest.cc',
         'browser/net/sqlite_persistent_cookie_store_unittest.cc',
@@ -443,7 +447,6 @@
         'browser/renderer_host/input/touch_disposition_gesture_filter_unittest.cc',
         'browser/renderer_host/input/touch_event_queue_unittest.cc',
         'browser/renderer_host/media/audio_input_device_manager_unittest.cc',
-        'browser/renderer_host/media/audio_mirroring_manager_unittest.cc',
         'browser/renderer_host/media/audio_renderer_host_unittest.cc',
         'browser/renderer_host/media/device_request_message_filter_unittest.cc',
         'browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc',
@@ -454,9 +457,6 @@
         'browser/renderer_host/media/video_capture_controller_unittest.cc',
         'browser/renderer_host/media/video_capture_host_unittest.cc',
         'browser/renderer_host/media/video_capture_manager_unittest.cc',
-        'browser/renderer_host/media/video_capture_oracle_unittest.cc',
-        'browser/renderer_host/media/web_contents_audio_input_stream_unittest.cc',
-        'browser/renderer_host/media/web_contents_video_capture_device_unittest.cc',
         'browser/renderer_host/pepper/browser_ppapi_host_test.cc',
         'browser/renderer_host/pepper/browser_ppapi_host_test.h',
         'browser/renderer_host/pepper/pepper_file_system_browser_host_unittest.cc',
@@ -735,7 +735,7 @@
         }],
         ['enable_webrtc==1 and (OS=="linux" or OS=="mac" or OS=="win")', {
           'sources': [
-            'browser/renderer_host/media/desktop_capture_device_unittest.cc',
+            'browser/media/capture/desktop_capture_device_unittest.cc',
           ],
           'dependencies': [
             '../third_party/webrtc/modules/modules.gyp:desktop_capture',
@@ -743,7 +743,7 @@
         }],
         ['enable_webrtc==1 and chromeos==1', {
           'sources': [
-            'browser/renderer_host/media/desktop_capture_device_aura_unittest.cc',
+            'browser/media/capture/desktop_capture_device_aura_unittest.cc',
           ],
         }],
         # TODO(jrg): remove the OS=="android" section?
diff --git a/content/test/webrtc_audio_device_test.cc b/content/test/webrtc_audio_device_test.cc
index 17dc335..9d2d9da 100644
--- a/content/test/webrtc_audio_device_test.cc
+++ b/content/test/webrtc_audio_device_test.cc
@@ -11,9 +11,9 @@
 #include "base/run_loop.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/test/test_timeouts.h"
+#include "content/browser/media/capture/audio_mirroring_manager.h"
 #include "content/browser/media/media_internals.h"
 #include "content/browser/renderer_host/media/audio_input_renderer_host.h"
-#include "content/browser/renderer_host/media/audio_mirroring_manager.h"
 #include "content/browser/renderer_host/media/audio_renderer_host.h"
 #include "content/browser/renderer_host/media/media_stream_manager.h"
 #include "content/browser/renderer_host/media/mock_media_observer.h"