Ensure that --disable-extensions disables extension prefs from being enacted

chrome/browser/extensions/test_extension_prefs.cc

Index: chrome/browser/extensions/test_extension_prefs.cc
diff --git a/chrome/browser/extensions/test_extension_prefs.cc b/chrome/browser/extensions/test_extension_prefs.cc
index 6c262cff2516de48c4b504210ed9504dec278573..09c8dfe100e1ff20d339408471cfb53f7737e385 100644
--- a/chrome/browser/extensions/test_extension_prefs.cc
+++ b/chrome/browser/extensions/test_extension_prefs.cc
@@ -32,8 +32,10 @@ class MockExtensionPrefs : public ExtensionPrefs {
  public:
   MockExtensionPrefs(PrefService* prefs,
                      const FilePath& root_dir,
-                     ExtensionPrefValueMap* extension_pref_value_map)
-    : ExtensionPrefs(prefs, root_dir, extension_pref_value_map),
+                     ExtensionPrefValueMap* extension_pref_value_map,
+                     bool extensions_disabled)
+    : ExtensionPrefs(prefs, root_dir, extension_pref_value_map,
+                     extensions_disabled),
       currentTime(base::Time::Now()) {}
   ~MockExtensionPrefs() {}
 
@@ -48,7 +50,9 @@ class MockExtensionPrefs : public ExtensionPrefs {
 
 }  // namespace
 
-TestExtensionPrefs::TestExtensionPrefs() : pref_service_(NULL) {
+TestExtensionPrefs::TestExtensionPrefs()
+    : pref_service_(NULL),
+      extensions_disabled_(false) {
   EXPECT_TRUE(temp_dir_.CreateUniqueTempDir());
   preferences_file_ = temp_dir_.path().AppendASCII("Preferences");
   extensions_dir_ = temp_dir_.path().AppendASCII("Extensions");
@@ -91,7 +95,8 @@ void TestExtensionPrefs::RecreateExtensionPrefs() {
 
   prefs_.reset(new MockExtensionPrefs(pref_service_.get(),
                                       temp_dir_.path(),
-                                      extension_pref_value_map_.get()));
+                                      extension_pref_value_map_.get(),
+                                      extensions_disabled_));
 }
 
 scoped_refptr<Extension> TestExtensionPrefs::AddExtension(std::string name) {
@@ -147,3 +152,7 @@ PrefService* TestExtensionPrefs::CreateIncognitoPrefService() const {
   return pref_service_->CreateIncognitoPrefService(
       new ExtensionPrefStore(extension_pref_value_map_.get(), true));
 }
+
+void TestExtensionPrefs::set_extensions_disabled(bool extensions_disabled) {
+  extensions_disabled_ = extensions_disabled;
+}