Get rid of extensions dependency from content\browser.

BUG=76789
Review URL: http://codereview.chromium.org/6693054

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

6 files changed, 16 insertions, 4 deletions

diff --git a/chrome/test/browser_with_test_window_test.cc b/chrome/test/browser_with_test_window_test.cc
index df70a7e..c945bf0 100644
--- a/chrome/test/browser_with_test_window_test.cc
+++ b/chrome/test/browser_with_test_window_test.cc
@@ -16,7 +16,6 @@
 #include "content/browser/tab_contents/navigation_controller.h"
 #include "content/browser/tab_contents/navigation_entry.h"
 #include "content/browser/tab_contents/tab_contents.h"
-#include "content/common/content_client.h"
 #include "content/common/page_transition_types.h"
 
 BrowserWithTestWindowTest::BrowserWithTestWindowTest()
@@ -33,7 +32,6 @@ void BrowserWithTestWindowTest::SetUp() {
   TestingBrowserProcessTest::SetUp();
 
   profile_.reset(CreateProfile());
-  content::GetContentClient()->set_browser(&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 0cc4711..35be3ad 100644
--- a/chrome/test/browser_with_test_window_test.h
+++ b/chrome/test/browser_with_test_window_test.h
@@ -7,7 +7,6 @@
 #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"
@@ -102,7 +101,6 @@ class BrowserWithTestWindowTest : public TestingBrowserProcessTest {
   BrowserThread file_thread_;
 
   scoped_ptr<TestingProfile> profile_;
-  chrome::ChromeContentBrowserClient browser_client_;
   scoped_ptr<TestBrowserWindow> window_;
   scoped_ptr<Browser> browser_;
 
diff --git a/chrome/test/testing_profile.cc b/chrome/test/testing_profile.cc
index 039cbb3..468c051 100644
--- a/chrome/test/testing_profile.cc
+++ b/chrome/test/testing_profile.cc
@@ -796,6 +796,10 @@ PrefService* TestingProfile::GetOffTheRecordPrefs() {
   return NULL;
 }
 
+quota::SpecialStoragePolicy* TestingProfile::GetSpecialStoragePolicy() {
+  return GetExtensionSpecialStoragePolicy();
+}
+
 void TestingProfile::DestroyWebDataService() {
   if (!web_data_service_.get())
     return;
diff --git a/chrome/test/testing_profile.h b/chrome/test/testing_profile.h
index 3ac8d27..154294f 100644
--- a/chrome/test/testing_profile.h
+++ b/chrome/test/testing_profile.h
@@ -20,6 +20,10 @@ namespace net {
 class CookieMonster;
 }
 
+namespace quota {
+class SpecialStoragePolicy;
+}
+
 class AutocompleteClassifier;
 class BookmarkModel;
 class CommandLine;
@@ -283,6 +287,11 @@ class TestingProfile : public Profile {
   virtual prerender::PrerenderManager* GetPrerenderManager();
   virtual PrefService* GetOffTheRecordPrefs();
 
+  // TODO(jam): remove me once webkit_context_unittest.cc doesn't use Profile
+  // and gets the quota::SpecialStoragePolicy* from whatever ends up replacing
+  // it in the content module.
+  quota::SpecialStoragePolicy* GetSpecialStoragePolicy();
+
  protected:
   base::Time start_time_;
   scoped_ptr<PrefService> prefs_;
diff --git a/chrome/test/unit/chrome_test_suite.cc b/chrome/test/unit/chrome_test_suite.cc
index f8eaf48..ea42dce 100644
--- a/chrome/test/unit/chrome_test_suite.cc
+++ b/chrome/test/unit/chrome_test_suite.cc
@@ -99,6 +99,7 @@ void ChromeTestSuite::Initialize() {
 
   // Initialize the content client which that code uses to talk to Chrome.
   content::SetContentClient(&chrome_content_client_);
+  content::GetContentClient()->set_browser(&chrome_browser_content_client_);
 
   chrome::RegisterChromeSchemes();
   host_resolver_proc_ = new LocalHostResolverProc();
diff --git a/chrome/test/unit/chrome_test_suite.h b/chrome/test/unit/chrome_test_suite.h
index be0430c..a8d89e6 100644
--- a/chrome/test/unit/chrome_test_suite.h
+++ b/chrome/test/unit/chrome_test_suite.h
@@ -15,6 +15,7 @@
 #include "base/path_service.h"
 #include "base/test/test_suite.h"
 #include "chrome/app/scoped_ole_initializer.h"
+#include "chrome/browser/chrome_content_browser_client.h"
 #include "chrome/common/chrome_content_client.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "net/base/mock_host_resolver.h"
@@ -55,6 +56,7 @@ class ChromeTestSuite : public base::TestSuite {
 
   // Client for embedding content in Chrome.
   chrome::ChromeContentClient chrome_content_client_;
+  chrome::ChromeContentBrowserClient chrome_browser_content_client_;
 
   base::StatsTable* stats_table_;