Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(83)

Unified Diff: chrome/browser/extensions/test_extension_prefs.cc

Issue 8060017: Ensure that --disable-extensions disables extension prefs from being enacted (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Split ExtensionPrefs constructor into constructor and Init function Created 9 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/extensions/test_extension_prefs.h ('k') | chrome/browser/profiles/profile_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..cddd5bd8ca99faf469c16a241fc27cd0c04b7d85 100644
--- a/chrome/browser/extensions/test_extension_prefs.cc
+++ b/chrome/browser/extensions/test_extension_prefs.cc
@@ -48,7 +48,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");
@@ -92,6 +94,7 @@ void TestExtensionPrefs::RecreateExtensionPrefs() {
prefs_.reset(new MockExtensionPrefs(pref_service_.get(),
temp_dir_.path(),
extension_pref_value_map_.get()));
+ prefs_->Init(extensions_disabled_);
}
scoped_refptr<Extension> TestExtensionPrefs::AddExtension(std::string name) {
@@ -147,3 +150,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;
+}
« no previous file with comments | « chrome/browser/extensions/test_extension_prefs.h ('k') | chrome/browser/profiles/profile_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698