Make ContentBrowserClient not be owned by ContentClient, so that the latter doesn't have to include a header from the former. Also tighten up DEPS checking so that we ensure that content\common doesn't depend on any other content directory.

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

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

4 files changed, 8 insertions, 3 deletions

diff --git a/content/browser/DEPS b/content/browser/DEPS
new file mode 100644
index 0000000..ed03eca
--- /dev/null
+++ b/content/browser/DEPS
@@ -0,0 +1,4 @@
+include_rules = [

+  "+content/gpu",  # For single-process mode.

+]

+

diff --git a/content/browser/renderer_host/test_render_view_host.cc b/content/browser/renderer_host/test_render_view_host.cc
index ac1caae..3f4f200 100644
--- a/content/browser/renderer_host/test_render_view_host.cc
+++ b/content/browser/renderer_host/test_render_view_host.cc
@@ -3,7 +3,6 @@
 // found in the LICENSE file.
 
 #include "chrome/browser/browser_url_handler.h"
-#include "chrome/browser/chrome_content_browser_client.h"
 #include "chrome/common/dom_storage_common.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/render_messages_params.h"
@@ -342,8 +341,7 @@ void RenderViewHostTestHarness::Reload() {
 void RenderViewHostTestHarness::SetUp() {
   // Initialize Chrome's ContentBrowserClient here, since we won't go through
   // BrowserMain.
-  content::GetContentClient()->set_browser_client(
-      new chrome::ChromeContentBrowserClient());
+  content::GetContentClient()->set_browser_client(&browser_client_);
   contents_.reset(CreateTestTabContents());
 }
 
diff --git a/content/browser/renderer_host/test_render_view_host.h b/content/browser/renderer_host/test_render_view_host.h
index cce4a27..6e70731 100644
--- a/content/browser/renderer_host/test_render_view_host.h
+++ b/content/browser/renderer_host/test_render_view_host.h
@@ -10,6 +10,7 @@
 #include "base/gtest_prod_util.h"
 #include "base/message_loop.h"
 #include "build/build_config.h"
+#include "chrome/browser/chrome_content_browser_client.h"
 #include "chrome/common/page_transition_types.h"
 #include "content/browser/renderer_host/mock_render_process_host.h"
 #include "content/browser/renderer_host/render_view_host.h"
@@ -302,6 +303,7 @@ class RenderViewHostTestHarness : public testing::Test {
   MockRenderProcessHostFactory rph_factory_;
   TestRenderViewHostFactory rvh_factory_;
 
+  chrome::ChromeContentBrowserClient browser_client_;
   scoped_ptr<TestTabContents> contents_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderViewHostTestHarness);
diff --git a/content/browser/tab_contents/render_view_host_manager.cc b/content/browser/tab_contents/render_view_host_manager.cc
index 0b49c33..51f5894 100644
--- a/content/browser/tab_contents/render_view_host_manager.cc
+++ b/content/browser/tab_contents/render_view_host_manager.cc
@@ -11,6 +11,7 @@
 #include "chrome/common/render_messages.h"
 #include "chrome/common/render_messages_params.h"
 #include "chrome/common/url_constants.h"
+#include "content/browser/content_browser_client.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/renderer_host/render_view_host_delegate.h"
 #include "content/browser/renderer_host/render_view_host_factory.h"