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

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

Issue 5784004: Add DCHECKs to StatefulExternalExtensionProvider (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase before commit Created 10 years 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
Index: chrome/browser/extensions/external_pref_extension_provider.cc
diff --git a/chrome/browser/extensions/external_pref_extension_provider.cc b/chrome/browser/extensions/external_pref_extension_provider.cc
index 7580388cf4070c1750dece77d2485b10e5f57012..7ea5f4a2a05dd5ae311fd01ba168371ddaacda3e 100644
--- a/chrome/browser/extensions/external_pref_extension_provider.cc
+++ b/chrome/browser/extensions/external_pref_extension_provider.cc
@@ -9,12 +9,14 @@
#include "base/file_util.h"
#include "base/logging.h"
#include "base/path_service.h"
+#include "chrome/browser/browser_thread.h"
#include "chrome/browser/extensions/stateful_external_extension_provider.h"
#include "chrome/common/json_value_serializer.h"
ExternalPrefExtensionProvider::ExternalPrefExtensionProvider()
: StatefulExternalExtensionProvider(Extension::EXTERNAL_PREF,
Extension::EXTERNAL_PREF_DOWNLOAD) {
+ DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
FilePath json_file;
PathService::Get(app::DIR_EXTERNAL_EXTENSIONS, &json_file);
json_file = json_file.Append(FILE_PATH_LITERAL("external_extensions.json"));
@@ -23,11 +25,12 @@ ExternalPrefExtensionProvider::ExternalPrefExtensionProvider()
JSONFileValueSerializer serializer(json_file);
SetPreferences(&serializer);
} else {
- prefs_.reset(new DictionaryValue());
+ set_prefs(new DictionaryValue());
}
}
ExternalPrefExtensionProvider::~ExternalPrefExtensionProvider() {
+ DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
}
void ExternalPrefExtensionProvider::SetPreferencesForTesting(
@@ -50,5 +53,5 @@ void ExternalPrefExtensionProvider::SetPreferences(
dictionary.reset(static_cast<DictionaryValue*>(extensions));
}
}
- prefs_.reset(dictionary.release());
+ set_prefs(dictionary.release());
}

Powered by Google App Engine
This is Rietveld 408576698