Move more files to content_unittests.

Reduce dependencies on chrome/

BUG=90443

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

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

5 files changed, 35 insertions, 59 deletions

diff --git a/content/browser/DEPS b/content/browser/DEPS
index 7fec844..4794649 100644
--- a/content/browser/DEPS
+++ b/content/browser/DEPS
@@ -6,6 +6,5 @@ include_rules = [
   # for more information.
 
   # ONLY USED BY TESTS
-	"+chrome/browser/browser_process.h",
   "+chrome/browser/ui/browser.h",
 ]
diff --git a/content/browser/debugger/devtools_manager_unittest.cc b/content/browser/debugger/devtools_manager_unittest.cc
index 668054e..03f541b0 100644
--- a/content/browser/debugger/devtools_manager_unittest.cc
+++ b/content/browser/debugger/devtools_manager_unittest.cc
@@ -4,10 +4,10 @@
 
 #include "base/basictypes.h"
 #include "base/time.h"
-#include "chrome/browser/browser_process.h"
-#include "chrome/test/base/testing_browser_process.h"
+#include "content/browser/content_browser_client.h"
 #include "content/browser/debugger/devtools_client_host.h"
 #include "content/browser/debugger/devtools_manager.h"
+#include "content/browser/mock_content_browser_client.h"
 #include "content/browser/renderer_host/test_render_view_host.h"
 #include "content/browser/tab_contents/tab_contents_delegate.h"
 #include "content/browser/tab_contents/test_tab_contents.h"
@@ -84,6 +84,22 @@ class TestTabContentsDelegate : public TabContentsDelegate {
   bool renderer_unresponsive_received_;
 };
 
+class DevToolsManagerTestBrowserClient
+    : public content::MockContentBrowserClient {
+ public:
+  DevToolsManagerTestBrowserClient() {
+  }
+
+  virtual DevToolsManager* GetDevToolsManager() OVERRIDE {
+    return &dev_tools_manager_;
+  }
+
+ private:
+  DevToolsManager dev_tools_manager_;
+
+  DISALLOW_COPY_AND_ASSIGN(DevToolsManagerTestBrowserClient);
+};
+
 }  // namespace
 
 class DevToolsManagerTest : public RenderViewHostTestHarness {
@@ -92,10 +108,22 @@ class DevToolsManagerTest : public RenderViewHostTestHarness {
   }
 
  protected:
-  virtual void SetUp() {
+  virtual void SetUp() OVERRIDE {
+    original_browser_client_ = content::GetContentClient()->browser();
+    content::GetContentClient()->set_browser(&browser_client_);
+
     RenderViewHostTestHarness::SetUp();
     TestDevToolsClientHost::ResetCounters();
   }
+
+  virtual void TearDown() OVERRIDE {
+    RenderViewHostTestHarness::TearDown();
+    content::GetContentClient()->set_browser(original_browser_client_);
+  }
+
+ private:
+  content::ContentBrowserClient* original_browser_client_;
+  DevToolsManagerTestBrowserClient browser_client_;
 };
 
 TEST_F(DevToolsManagerTest, OpenAndManuallyCloseDevToolsClientHost) {
@@ -144,13 +172,9 @@ TEST_F(DevToolsManagerTest, NoUnresponsiveDialogInInspectedTab) {
   TestTabContentsDelegate delegate;
   contents()->set_delegate(&delegate);
 
-  static_cast<TestingBrowserProcess*>(g_browser_process)->
-      SetDevToolsManager(new DevToolsManager());
-  DevToolsManager* manager = DevToolsManager::GetInstance();
-  ASSERT_TRUE(manager);
-
   TestDevToolsClientHost client_host;
-  manager->RegisterDevToolsClientHostFor(inspected_rvh, &client_host);
+  content::GetContentClient()->browser()->GetDevToolsManager()->
+      RegisterDevToolsClientHostFor(inspected_rvh, &client_host);
 
   // Start with a short timeout.
   inspected_rvh->StartHangMonitorTimeout(TimeDelta::FromMilliseconds(10));
diff --git a/content/browser/mock_content_browser_client.cc b/content/browser/mock_content_browser_client.cc
index 8bf2e35..026c02b 100644
--- a/content/browser/mock_content_browser_client.cc
+++ b/content/browser/mock_content_browser_client.cc
@@ -8,6 +8,7 @@
 
 #include "base/file_path.h"
 #include "content/browser/webui/empty_web_ui_factory.h"
+#include "content/test/test_tab_contents_view.h"
 #include "googleurl/src/gurl.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/clipboard/clipboard.h"
@@ -20,7 +21,7 @@ MockContentBrowserClient::~MockContentBrowserClient() {
 
 TabContentsView* MockContentBrowserClient::CreateTabContentsView(
     TabContents* tab_contents) {
-  return NULL;
+  return new TestTabContentsView;
 }
 
 void MockContentBrowserClient::RenderViewHostCreated(
diff --git a/content/browser/plugin_service_unittest.cc b/content/browser/plugin_service_unittest.cc
deleted file mode 100644
index 4d9f420..0000000
--- a/content/browser/plugin_service_unittest.cc
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "content/browser/plugin_service.h"
-
-#include "content/browser/browser_thread.h"
-#include "testing/gtest/include/gtest/gtest.h"
-
-namespace {
-
-class PluginServiceTest : public testing::Test {
- public:
-  PluginServiceTest()
-      : message_loop_(MessageLoop::TYPE_IO),
-        ui_thread_(BrowserThread::UI, &message_loop_),
-        file_thread_(BrowserThread::FILE, &message_loop_),
-        io_thread_(BrowserThread::IO, &message_loop_) {}
-
-
-  virtual void SetUp() {
-    plugin_service_ = PluginService::GetInstance();
-    ASSERT_TRUE(plugin_service_);
-  }
-
- protected:
-  MessageLoop message_loop_;
-  PluginService* plugin_service_;
-
- private:
-  BrowserThread ui_thread_;
-  BrowserThread file_thread_;
-  BrowserThread io_thread_;
-
-  DISALLOW_COPY_AND_ASSIGN(PluginServiceTest);
-};
-
-TEST_F(PluginServiceTest, GetUILocale) {
-  // Check for a non-empty locale string.
-  EXPECT_NE("", plugin_service_->GetUILocale());
-}
-
-}  // namespace
diff --git a/content/browser/tab_contents/tab_contents_view.h b/content/browser/tab_contents/tab_contents_view.h
index bbc6d3b..f5c58be 100644
--- a/content/browser/tab_contents/tab_contents_view.h
+++ b/content/browser/tab_contents/tab_contents_view.h
@@ -27,11 +27,6 @@ class TabContentsView : public RenderViewHostDelegate::View {
  public:
   virtual ~TabContentsView();
 
-  // Creates the appropriate type of TabContentsView for the current system.
-  // The return value is a new heap allocated view with ownership passing to
-  // the caller.
-  static TabContentsView* Create(TabContents* tab_contents);
-
   virtual void CreateView(const gfx::Size& initial_size) = 0;
 
   // Sets up the View that holds the rendered web page, receives messages for