Clean up DEPS rules against content so that not all chrome code can i…

…nclude anything from content.

I also moved ChromeContentPluginClient to chrome\plugin where it really belongs (i.e. to match what we do with the utility client).
Review URL: http://codereview.chromium.org/8095011

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

chrome/DEPS

@@ -1,5 +1,4 @@
 include_rules = [
-  "+content",
   "+crypto",
   "+gpu",
   "+net",
@@ -12,6 +11,9 @@ include_rules = [
   "-chrome",
   "+chrome/common",
   "+chrome/test",
+  "-content",
+  "+content/common",
+  "+content/test",
 
   # Don't allow inclusion of these other libs we shouldn't be calling directly.
   "-v8",

chrome/app/DEPS

@@ -2,8 +2,12 @@ include_rules = [
   "+breakpad",
   "+chrome/browser",
   "+chrome/installer",
+  "+chrome/plugin/chrome_content_plugin_client.h",
   "+chrome/renderer/chrome_content_renderer_client.h",
   "+chrome/utility/chrome_content_utility_client.h",
+  "+content/app",
+  "+content/browser/renderer_host/render_process_host.h",
+  "+content/renderer/renderer_main.h",
   "+grit",  # For generated headers
   "+media/base",  # For initializing media library.
   "+policy",  # For generated headers and source

chrome/app/chrome_main.cc

@@ -17,14 +17,14 @@
 #include "chrome/browser/diagnostics/diagnostics_main.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_content_client.h"
-#include "chrome/common/chrome_content_plugin_client.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_paths_internal.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/logging_chrome.h"
 #include "chrome/common/profiling.h"
 #include "chrome/common/url_constants.h"
+#include "chrome/plugin/chrome_content_plugin_client.h"
 #include "chrome/renderer/chrome_content_renderer_client.h"
 #include "chrome/utility/chrome_content_utility_client.h"
 #include "content/app/content_main.h"

chrome/browser/DEPS

@@ -3,10 +3,11 @@ include_rules = [
   "+chrome/app/locales",
   "+chrome/installer",
   "+chrome/personalization",
-  "+chrome/plugin",  # For Mac plugin interpose library.
   "+chrome/profile_import",
   "+chrome/tools/profiles",  # For history unit tests.
   "+chrome/views",
+  "+content/browser",
+  "+content/plugin/plugin_interpose_util_mac.h",
   "+grit",  # For generated headers
   "+media/audio",  # For audio input for speech input feature.
   "+policy",  # For generated headers and source

chrome/chrome.gyp

@@ -25,6 +25,7 @@
       'browser',
       'debugger',
       'profile_import',
+      'plugin',
       'renderer',
       'syncapi_core',
       'utility',
@@ -437,6 +438,22 @@
         }],
       ],
     },
+    {
+      'target_name': 'plugin',
+      'type': 'static_library',
+      'dependencies': [
+        '../base/base.gyp:base',
+        '../content/content.gyp:content_plugin',
+      ],
+      'sources': [
+        'plugin/chrome_content_plugin_client.cc',
+        'plugin/chrome_content_plugin_client.h',
+      ],
+      'include_dirs': [
+        '..',
+        '<(grit_out_dir)',
+      ],
+    },        
     {
       'target_name': 'utility',
       'type': 'static_library',

chrome/chrome_common.gypi

@@ -70,8 +70,6 @@
         'common/child_process_logging_win.cc',
         'common/chrome_content_client.cc',
         'common/chrome_content_client.h',
-        'common/chrome_content_plugin_client.cc',
-        'common/chrome_content_plugin_client.h',
         'common/chrome_notification_types.h',
         'common/chrome_plugin_messages.h',
         'common/chrome_version_info.cc',

chrome/chrome_renderer.gypi

@@ -14,7 +14,6 @@
         'chrome_strings',
         'safe_browsing_proto',
         '../content/content.gyp:content_renderer',
-        '../content/content.gyp:content_plugin',
         '../net/net.gyp:net',
         '../ppapi/ppapi_internal.gyp:ppapi_proxy',
         '../printing/printing.gyp:printing',

chrome/nacl/DEPS

@@ -1,13 +1,6 @@
 include_rules = [
-  # TODO(mseaborn): Remove chrome/renderer from this list.  This is
-  # here because we need chrome/renderer/renderer_sandbox_support_linux.h
-  # for creating shared memory segments.  We should probably move this
-  # sandbox support code out of chrome/renderer.  (Previously, this
-  # header was #included from the native_client directory, which was
-  # worse.)
-  "+chrome/app",
-  "+chrome/renderer",
-  "+chrome/test",
+  "+chrome/app/breakpad_win.h",
+  "+content/app/startup_helper_win.h",
   "+sandbox/src",
   "+native_client/src",
 ]

chrome/plugin/DEPS

@@ -0,0 +1,4 @@
+include_rules = [
+  "+content/plugin",
+  "+grit",
+]

chrome/common/chrome_content_plugin_client.cc → chrome/plugin/chrome_content_plugin_client.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 "chrome/common/chrome_content_plugin_client.h"
+#include "chrome/plugin/chrome_content_plugin_client.h"
 
 #include "chrome/common/default_plugin.h"
 

chrome/common/chrome_content_plugin_client.h → chrome/plugin/chrome_content_plugin_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 CHROME_COMMON_CHROME_CONTENT_PLUGIN_CLIENT_H_
-#define CHROME_COMMON_CHROME_CONTENT_PLUGIN_CLIENT_H_
+#ifndef CHROME_PLUGIN_CHROME_CONTENT_PLUGIN_CLIENT_H_
+#define CHROME_PLUGIN_CHROME_CONTENT_PLUGIN_CLIENT_H_
 #pragma once
 
 #include "base/compiler_specific.h"
@@ -18,4 +18,4 @@ class ChromeContentPluginClient : public content::ContentPluginClient {
 
 }  // namespace chrome
 
-#endif  // CHROME_COMMON_CHROME_CONTENT_PLUGIN_CLIENT_H_
+#endif  // CHROME_PLUGIN_CHROME_CONTENT_PLUGIN_CLIENT_H_

chrome/renderer/DEPS

@@ -1,6 +1,6 @@
 include_rules = [
   "+chrome/app",  # The plugins use the theme library to get the sad plugin bitmap.
-  "+chrome/plugin",
+  "+content/renderer",
   "+grit",  # For generated headers
   "+media/base",  # For initializing media library and media switches.
   "+ppapi/native_client/src/trusted/plugin/nacl_entry_points.h",  # For NaCl registration.

chrome/test/DEPS

@@ -1,6 +1,7 @@
 include_rules = [
-  # The test directory can do whatever it wants in chrome.
+  # The test directory can do whatever it wants in chrome and content.
   "+chrome",
+  "+content",
   "+grit",  # For generated headers
   "+sandbox/src",
   "+sandbox/tests",

chrome/tools/DEPS

@@ -1,4 +1,5 @@
 include_rules = [
   "+chrome/browser",
   "+chrome/third_party/hunspell/google",
+  "+content/browser",
 ]

chrome/utility/DEPS

@@ -1,3 +1,4 @@
 include_rules = [
+  "+content/utility",
   "+webkit/glue",
 ]