Move the PluginDataRemover class to content, and remove the chrome pieces from it. This class rea...

content/browser/plugin_data_remover_impl_browsertest.cc

Index: content/browser/plugin_data_remover_impl_browsertest.cc
===================================================================
--- content/browser/plugin_data_remover_impl_browsertest.cc	(revision 110324)
+++ content/browser/plugin_data_remover_impl_browsertest.cc	(working copy)
@@ -2,18 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/plugin_data_remover.h"
-
+#include "base/base_paths.h"
 #include "base/command_line.h"
 #include "base/path_service.h"
 #include "base/synchronization/waitable_event_watcher.h"
-#include "chrome/browser/ui/browser.h"
-#include "chrome/browser/browser_process.h"
-#include "chrome/browser/prefs/pref_service.h"
-#include "chrome/browser/profiles/profile.h"
-#include "chrome/common/chrome_paths.h"
-#include "chrome/common/chrome_switches.h"
-#include "chrome/common/pref_names.h"
+#include "content/browser/plugin_data_remover_impl.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"
 
@@ -33,7 +27,7 @@
   virtual void SetUpCommandLine(CommandLine* command_line) {
 #ifdef OS_MACOSX
     FilePath browser_directory;
-    PathService::Get(chrome::DIR_APP, &browser_directory);
+    PathService::Get(base::DIR_MODULE, &browser_directory);
     command_line->AppendSwitchPath(switches::kExtraPluginDir,
                                    browser_directory.AppendASCII("plugins"));
 #endif
@@ -41,12 +35,11 @@
 };
 
 IN_PROC_BROWSER_TEST_F(PluginDataRemoverTest, RemoveData) {
-  scoped_refptr<PluginDataRemover> plugin_data_remover(
-      new PluginDataRemover(browser()->profile()));
-  plugin_data_remover->set_mime_type(kNPAPITestPluginMimeType);
+  PluginDataRemoverImpl plugin_data_remover(GetResourceContext());
+  plugin_data_remover.set_mime_type(kNPAPITestPluginMimeType);
   base::WaitableEventWatcher watcher;
   base::WaitableEvent* event =
-      plugin_data_remover->StartRemoving(base::Time());
+      plugin_data_remover.StartRemoving(base::Time());
   watcher.StartWatching(event, this);
   ui_test_utils::RunMessageLoop();
 }