ABANDONED: Remove Chrome dependencies from TestExtensionPrefs.

chrome/browser/extensions/extension_prefs_unittest.cc

Index: chrome/browser/extensions/extension_prefs_unittest.cc
diff --git a/chrome/browser/extensions/extension_prefs_unittest.cc b/chrome/browser/extensions/extension_prefs_unittest.cc
index 04c0b98e0e2313e1f78aece87ee09d4063f615ac..60900332061df24b1be48619bc0f9ddd8e2f993a 100644
--- a/chrome/browser/extensions/extension_prefs_unittest.cc
+++ b/chrome/browser/extensions/extension_prefs_unittest.cc
@@ -16,8 +16,6 @@
 #include "base/values.h"
 #include "chrome/browser/extensions/extension_pref_value_map.h"
 #include "chrome/browser/extensions/extension_prefs.h"
-#include "chrome/browser/prefs/pref_service_syncable.h"
-#include "chrome/common/chrome_paths.h"
 #include "components/user_prefs/pref_registry_syncable.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
@@ -39,9 +37,11 @@ static void AddPattern(URLPatternSet* extent, const std::string& pattern) {
   extent->AddPattern(URLPattern(schemes, pattern));
 }
 
-ExtensionPrefsTest::ExtensionPrefsTest()
+ExtensionPrefsTest::ExtensionPrefsTest(
+    base::PrefServiceFactory* custom_pref_service_factory)
     : ui_thread_(BrowserThread::UI, &message_loop_),
-      prefs_(message_loop_.message_loop_proxy().get()) {}
+      prefs_(message_loop_.message_loop_proxy().get(),
+             custom_pref_service_factory) {}
 
 ExtensionPrefsTest::~ExtensionPrefsTest() {
 }
@@ -70,7 +70,8 @@ void ExtensionPrefsTest::TearDown() {
 class ExtensionPrefsLastPingDay : public ExtensionPrefsTest {
  public:
   ExtensionPrefsLastPingDay()
-      : extension_time_(Time::Now() - TimeDelta::FromHours(4)),
+      : ExtensionPrefsTest(NULL),
+        extension_time_(Time::Now() - TimeDelta::FromHours(4)),
         blacklist_time_(Time::Now() - TimeDelta::FromHours(2)) {}
 
   virtual void Initialize() OVERRIDE {
@@ -99,6 +100,8 @@ TEST_F(ExtensionPrefsLastPingDay, LastPingDay) {}
 // Tests the GetToolbarOrder/SetToolbarOrder functions.
 class ExtensionPrefsToolbarOrder : public ExtensionPrefsTest {
  public:
+  ExtensionPrefsToolbarOrder() : ExtensionPrefsTest(NULL) {}
+
   virtual void Initialize() OVERRIDE {
     list_.push_back(prefs_.AddExtensionAndReturnId("1"));
     list_.push_back(prefs_.AddExtensionAndReturnId("2"));
@@ -121,6 +124,8 @@ TEST_F(ExtensionPrefsToolbarOrder, ToolbarOrder) {}
 // Tests the GetKnownDisabled/SetKnownDisabled functions.
 class ExtensionPrefsKnownDisabled : public ExtensionPrefsTest {
  public:
+  ExtensionPrefsKnownDisabled() : ExtensionPrefsTest(NULL) {}
+
   virtual void Initialize() OVERRIDE {
     ExtensionIdSet before_set;
     EXPECT_FALSE(prefs()->GetKnownDisabled(&before_set));
@@ -152,6 +157,8 @@ TEST_F(ExtensionPrefsKnownDisabled, KnownDisabled) {}
 // Tests the IsExtensionDisabled/SetExtensionState functions.
 class ExtensionPrefsExtensionState : public ExtensionPrefsTest {
  public:
+  ExtensionPrefsExtensionState() : ExtensionPrefsTest(NULL) {}
+
   virtual void Initialize() OVERRIDE {
     extension = prefs_.AddExtension("test");
     prefs()->SetExtensionState(extension->id(), Extension::DISABLED);
@@ -168,6 +175,8 @@ TEST_F(ExtensionPrefsExtensionState, ExtensionState) {}
 
 class ExtensionPrefsEscalatePermissions : public ExtensionPrefsTest {
  public:
+  ExtensionPrefsEscalatePermissions() : ExtensionPrefsTest(NULL) {}
+
   virtual void Initialize() OVERRIDE {
     extension = prefs_.AddExtension("test");
     prefs()->SetDidExtensionEscalatePermissions(extension.get(), true);
@@ -185,6 +194,8 @@ TEST_F(ExtensionPrefsEscalatePermissions, EscalatePermissions) {}
 // Tests the AddGrantedPermissions / GetGrantedPermissions functions.
 class ExtensionPrefsGrantedPermissions : public ExtensionPrefsTest {
  public:
+  ExtensionPrefsGrantedPermissions() : ExtensionPrefsTest(NULL) {}
+
   virtual void Initialize() OVERRIDE {
     const APIPermissionInfo* permission_info =
       PermissionsInfo::GetInstance()->GetByID(APIPermission::kSocket);
@@ -338,6 +349,8 @@ TEST_F(ExtensionPrefsGrantedPermissions, GrantedPermissions) {}
 // Tests the SetActivePermissions / GetActivePermissions functions.
 class ExtensionPrefsActivePermissions : public ExtensionPrefsTest {
  public:
+  ExtensionPrefsActivePermissions() : ExtensionPrefsTest(NULL) {}
+
   virtual void Initialize() OVERRIDE {
     extension_id_ = prefs_.AddExtensionAndReturnId("test");
 
@@ -389,6 +402,8 @@ TEST_F(ExtensionPrefsActivePermissions, SetAndGetActivePermissions) {}
 // Tests the GetVersionString function.
 class ExtensionPrefsVersionString : public ExtensionPrefsTest {
  public:
+  ExtensionPrefsVersionString() : ExtensionPrefsTest(NULL) {}
+
   virtual void Initialize() OVERRIDE {
     extension = prefs_.AddExtension("test");
     EXPECT_EQ("0.1", prefs()->GetVersionString(extension->id()));
@@ -407,6 +422,8 @@ TEST_F(ExtensionPrefsVersionString, VersionString) {}
 
 class ExtensionPrefsAcknowledgment : public ExtensionPrefsTest {
  public:
+  ExtensionPrefsAcknowledgment() : ExtensionPrefsTest(NULL) {}
+
   virtual void Initialize() OVERRIDE {
     not_installed_id_ = "pghjnghklobnfoidcldiidjjjhkeeaoi";
 
@@ -471,6 +488,8 @@ TEST_F(ExtensionPrefsAcknowledgment, Acknowledgment) {}
 // Tests the idle install information functions.
 class ExtensionPrefsDelayedInstallInfo : public ExtensionPrefsTest {
  public:
+  ExtensionPrefsDelayedInstallInfo() : ExtensionPrefsTest(NULL) {}
+
   // Sets idle install information for one test extension.
   void SetIdleInfo(std::string id, int num) {
     DictionaryValue manifest;
@@ -512,7 +531,6 @@ class ExtensionPrefsDelayedInstallInfo : public ExtensionPrefsTest {
   }
 
   virtual void Initialize() OVERRIDE {
-    PathService::Get(chrome::DIR_TEST_DATA, &basedir_);
     now_ = Time::Now();
     id1_ = prefs_.AddExtensionAndReturnId("1");
     id2_ = prefs_.AddExtensionAndReturnId("2");
@@ -572,7 +590,6 @@ class ExtensionPrefsDelayedInstallInfo : public ExtensionPrefsTest {
 
  protected:
   Time now_;
-  base::FilePath basedir_;
   std::string id1_;
   std::string id2_;
   std::string id3_;
@@ -583,6 +600,8 @@ TEST_F(ExtensionPrefsDelayedInstallInfo, DelayedInstallInfo) {}
 // Tests the FinishDelayedInstallInfo function.
 class ExtensionPrefsFinishDelayedInstallInfo : public ExtensionPrefsTest {
  public:
+  ExtensionPrefsFinishDelayedInstallInfo() : ExtensionPrefsTest(NULL) {}
+
   virtual void Initialize() OVERRIDE {
     DictionaryValue dictionary;
     dictionary.SetString(manifest_keys::kName, "test");
@@ -641,6 +660,8 @@ TEST_F(ExtensionPrefsFinishDelayedInstallInfo, FinishDelayedInstallInfo) {}
 
 class ExtensionPrefsOnExtensionInstalled : public ExtensionPrefsTest {
  public:
+  ExtensionPrefsOnExtensionInstalled() : ExtensionPrefsTest(NULL) {}
+
   virtual void Initialize() OVERRIDE {
     extension_ = prefs_.AddExtension("on_extension_installed");
     EXPECT_FALSE(prefs()->IsExtensionDisabled(extension_->id()));
@@ -662,6 +683,8 @@ TEST_F(ExtensionPrefsOnExtensionInstalled,
 
 class ExtensionPrefsAppDraggedByUser : public ExtensionPrefsTest {
  public:
+  ExtensionPrefsAppDraggedByUser() : ExtensionPrefsTest(NULL) {}
+
   virtual void Initialize() OVERRIDE {
     extension_ = prefs_.AddExtension("on_extension_installed");
     EXPECT_FALSE(prefs()->WasAppDraggedByUser(extension_->id()));
@@ -688,6 +711,8 @@ TEST_F(ExtensionPrefsAppDraggedByUser, ExtensionPrefsAppDraggedByUser) {}
 
 class ExtensionPrefsFlags : public ExtensionPrefsTest {
  public:
+  ExtensionPrefsFlags() : ExtensionPrefsTest(NULL) {}
+
   virtual void Initialize() OVERRIDE {
     {
       base::DictionaryValue dictionary;
@@ -733,8 +758,9 @@ class ExtensionPrefsFlags : public ExtensionPrefsTest {
 };
 TEST_F(ExtensionPrefsFlags, ExtensionPrefsFlags) {}
 
-PrefsPrepopulatedTestBase::PrefsPrepopulatedTestBase()
-    : ExtensionPrefsTest() {
+PrefsPrepopulatedTestBase::PrefsPrepopulatedTestBase(
+    base::PrefServiceFactory* custom_pref_service_factory)
+    : ExtensionPrefsTest(custom_pref_service_factory) {
   DictionaryValue simple_dict;
   std::string error;
 
@@ -776,6 +802,7 @@ PrefsPrepopulatedTestBase::~PrefsPrepopulatedTestBase() {
 // Tests that blacklist state can be queried.
 class ExtensionPrefsBlacklistedExtensions : public ExtensionPrefsTest {
  public:
+  ExtensionPrefsBlacklistedExtensions() : ExtensionPrefsTest(NULL) {}
   virtual ~ExtensionPrefsBlacklistedExtensions() {}
 
   virtual void Initialize() OVERRIDE {