Move a number of other tests from browser_tests to content_browsertests.

BUG=90448
Review URL: https://chromiumcodereview.appspot.com/10821037

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

1 files changed, 8 insertions, 5 deletions

diff --git a/content/browser/plugin_data_remover_impl_browsertest.cc b/content/browser/plugin_data_remover_impl_browsertest.cc
index a087cf4..4ca35c5 100644
--- a/content/browser/plugin_data_remover_impl_browsertest.cc
+++ b/content/browser/plugin_data_remover_impl_browsertest.cc
@@ -7,9 +7,11 @@
 #include "base/path_service.h"
 #include "base/synchronization/waitable_event_watcher.h"
 #include "content/browser/plugin_data_remover_impl.h"
+#include "content/public/browser/web_contents.h"
 #include "content/public/common/content_switches.h"
-#include "chrome/test/base/in_process_browser_test.h"
-#include "chrome/test/base/ui_test_utils.h"
+#include "content/public/test/test_utils.h"
+#include "content/shell/shell.h"
+#include "content/test/content_browser_test.h"
 
 namespace content {
 
@@ -17,10 +19,10 @@ namespace {
 const char* kNPAPITestPluginMimeType = "application/vnd.npapi-test";
 }
 
-class PluginDataRemoverTest : public InProcessBrowserTest,
+class PluginDataRemoverTest : public ContentBrowserTest,
                               public base::WaitableEventWatcher::Delegate {
  public:
-  PluginDataRemoverTest() : InProcessBrowserTest() { }
+  PluginDataRemoverTest() {}
 
   virtual void OnWaitableEventSignaled(base::WaitableEvent* waitable_event) {
     MessageLoop::current()->Quit();
@@ -43,7 +45,8 @@ class PluginDataRemoverTest : public InProcessBrowserTest,
 };
 
 IN_PROC_BROWSER_TEST_F(PluginDataRemoverTest, RemoveData) {
-  PluginDataRemoverImpl plugin_data_remover(GetBrowserContext());
+  PluginDataRemoverImpl plugin_data_remover(
+      shell()->web_contents()->GetBrowserContext());
   plugin_data_remover.set_mime_type(kNPAPITestPluginMimeType);
   base::WaitableEventWatcher watcher;
   base::WaitableEvent* event =