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

5 files changed, 9 insertions, 9 deletions

diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc
index 59522f0..ac58f16 100644
--- a/chrome/browser/browser_main.cc
+++ b/chrome/browser/browser_main.cc
@@ -1477,8 +1477,8 @@ int BrowserMain(const MainFunctionParams& parameters) {
 
   // Override the default ContentBrowserClient to let Chrome participate in
   // content logic.  Must be done before any tabs are created.
-  content::GetContentClient()->set_browser_client(
-      new chrome::ChromeContentBrowserClient());
+  chrome::ChromeContentBrowserClient browser_client;
+  content::GetContentClient()->set_browser_client(&browser_client);
 
   // Tests should be able to tune login manager before showing it.
   // Thus only show login manager in normal (non-testing) mode.
diff --git a/chrome/common/chrome_content_client.cc b/chrome/common/chrome_content_client.cc
index eeba233..7e53a77 100644
--- a/chrome/common/chrome_content_client.cc
+++ b/chrome/common/chrome_content_client.cc
@@ -15,4 +15,7 @@ void ChromeContentClient::SetGpuInfo(const GPUInfo& gpu_info) {
   child_process_logging::SetGpuInfo(gpu_info);
 }
 
+void ChromeContentClient::PluginProcessStarted() {
+}
+
 }  // namespace chrome
diff --git a/chrome/common/chrome_content_client.h b/chrome/common/chrome_content_client.h
index 8c91fca..786ce96 100644
--- a/chrome/common/chrome_content_client.h
+++ b/chrome/common/chrome_content_client.h
@@ -12,12 +12,9 @@ namespace chrome {
 
 class ChromeContentClient : public content::ContentClient {
  public:
-  // Sets the URL that is logged if the child process crashes. Use GURL() to
-  // clear the URL.
   virtual void SetActiveURL(const GURL& url);
-
-  // Sets the data on the gpu to send along with crash reports.
   virtual void SetGpuInfo(const GPUInfo& gpu_info);
+  virtual void PluginProcessStarted();
 };
 
 }  // namespace chrome
diff --git a/chrome/test/browser_with_test_window_test.cc b/chrome/test/browser_with_test_window_test.cc
index 0cc73b4..dcea7a3 100644
--- a/chrome/test/browser_with_test_window_test.cc
+++ b/chrome/test/browser_with_test_window_test.cc
@@ -8,7 +8,6 @@
 #include <ole2.h>
 #endif  // defined(OS_WIN)
 
-#include "chrome/browser/chrome_content_browser_client.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
@@ -36,8 +35,7 @@ void BrowserWithTestWindowTest::SetUp() {
   // NOTE: I have a feeling we're going to want virtual methods for creating
   // these, as such they're in SetUp instead of the constructor.
   profile_.reset(new TestingProfile());
-  content::GetContentClient()->set_browser_client(
-      new chrome::ChromeContentBrowserClient());
+  content::GetContentClient()->set_browser_client(&browser_client_);
   browser_.reset(new Browser(Browser::TYPE_NORMAL, profile()));
   window_.reset(new TestBrowserWindow(browser()));
   browser_->set_window(window_.get());
diff --git a/chrome/test/browser_with_test_window_test.h b/chrome/test/browser_with_test_window_test.h
index 150b6e55..2340585 100644
--- a/chrome/test/browser_with_test_window_test.h
+++ b/chrome/test/browser_with_test_window_test.h
@@ -7,6 +7,7 @@
 #pragma once
 
 #include "base/message_loop.h"
+#include "chrome/browser/chrome_content_browser_client.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/test/test_browser_window.h"
 #include "chrome/test/testing_browser_process_test.h"
@@ -94,6 +95,7 @@ class BrowserWithTestWindowTest : public TestingBrowserProcessTest {
   BrowserThread file_thread_;
 
   scoped_ptr<TestingProfile> profile_;
+  chrome::ChromeContentBrowserClient browser_client_;
   scoped_ptr<TestBrowserWindow> window_;
   scoped_ptr<Browser> browser_;