Clamping down media DEPS rules.

BUG=none
TEST=checkdeps passes

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

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

10 files changed, 16 insertions, 7 deletions

diff --git a/content/DEPS b/content/DEPS
index 1081356..6b09f62 100644
--- a/content/DEPS
+++ b/content/DEPS
@@ -22,7 +22,6 @@ include_rules = [
 
   "+grit",
   "+gpu",
-  "+media",
   "+net",
   "+ppapi",
   "+printing",
diff --git a/content/browser/gpu/gpu_process_host.cc b/content/browser/gpu/gpu_process_host.cc
index 0eb1243..b275fa4 100644
--- a/content/browser/gpu/gpu_process_host.cc
+++ b/content/browser/gpu/gpu_process_host.cc
@@ -23,7 +23,6 @@
 #include "content/gpu/gpu_process.h"
 #include "ipc/ipc_channel_handle.h"
 #include "ipc/ipc_switches.h"
-#include "media/base/media_switches.h"
 #include "ui/gfx/gl/gl_context.h"
 #include "ui/gfx/gl/gl_switches.h"
 
diff --git a/content/browser/renderer_host/DEPS b/content/browser/renderer_host/DEPS
index b12c3bd..d56261f 100644
--- a/content/browser/renderer_host/DEPS
+++ b/content/browser/renderer_host/DEPS
@@ -1,5 +1,6 @@
 include_rules = [
   "+content/renderer",  # For single-process mode.
+  "+chrome/common/extensions",
+  "+media/base",  # For media command line switches.
   "+third_party/zlib",
-  "+chrome/common/extensions"
 ]
diff --git a/content/browser/renderer_host/media/DEPS b/content/browser/renderer_host/media/DEPS
new file mode 100644
index 0000000..c3a5b96
--- /dev/null
+++ b/content/browser/renderer_host/media/DEPS
@@ -0,0 +1,3 @@
+include_rules = [
+  "+media",
+]
diff --git a/content/browser/speech/DEPS b/content/browser/speech/DEPS
new file mode 100644
index 0000000..8fac8f4
--- /dev/null
+++ b/content/browser/speech/DEPS
@@ -0,0 +1,3 @@
+include_rules = [
+  "+media/audio",  # For audio input.
+]
diff --git a/content/common/gpu/DEPS b/content/common/gpu/DEPS
index d795ec0..aef4d63 100644
--- a/content/common/gpu/DEPS
+++ b/content/common/gpu/DEPS
@@ -3,8 +3,6 @@ include_rules = [
   "+gpu/command_buffer",

   "+libEGL",

   "+libGLESv2",

-  "+media/base",

-  "+media/video",

   "+skia",

   "+third_party/angle/include",

   "+third_party/openmax",

diff --git a/content/common/gpu/media/DEPS b/content/common/gpu/media/DEPS
new file mode 100644
index 0000000..c3a5b96
--- /dev/null
+++ b/content/common/gpu/media/DEPS
@@ -0,0 +1,3 @@
+include_rules = [
+  "+media",
+]
diff --git a/content/common/media/DEPS b/content/common/media/DEPS
new file mode 100644
index 0000000..c3a5b96
--- /dev/null
+++ b/content/common/media/DEPS
@@ -0,0 +1,3 @@
+include_rules = [
+  "+media",
+]
diff --git a/content/gpu/DEPS b/content/gpu/DEPS
index d0081f6..960dcc4 100644
--- a/content/gpu/DEPS
+++ b/content/gpu/DEPS
@@ -4,8 +4,7 @@ include_rules = [
   "+gpu/command_buffer",
   "+libEGL",
   "+libGLESv2",
-  "+media/base",
-  "+media/video",
+  "+media",  # TODO(scherkus): remove when gpu_video_decode_accelerator_tester.cc is deleted.
   "+sandbox",
   "+skia",
 ]
diff --git a/content/renderer/DEPS b/content/renderer/DEPS
index 13e3483..01805b7 100644
--- a/content/renderer/DEPS
+++ b/content/renderer/DEPS
@@ -2,6 +2,7 @@ include_rules = [
   "-chrome",
   "+chrome/test",
   "+content/plugin",  # For shared npruntime proxying code.
+  "+media",  # For audio input/output and audio/video decoding.
   "+third_party/mach_override",
   "+third_party/tcmalloc",
   "+v8/include",