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

Unified Diff: chrome/browser/extensions/api/web_request/web_request_api.cc

Issue 108193008: Don't post tasks from RulesRegistry c-tor (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Now it also compiles Created 7 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/api/web_request/web_request_api.cc
diff --git a/chrome/browser/extensions/api/web_request/web_request_api.cc b/chrome/browser/extensions/api/web_request/web_request_api.cc
index e104f92590533804ab6a5b10e6f0526ceeb03810..db42081cb049c07c027dc527bf0fa5167e2e993c 100644
--- a/chrome/browser/extensions/api/web_request/web_request_api.cc
+++ b/chrome/browser/extensions/api/web_request/web_request_api.cc
@@ -1961,10 +1961,11 @@ bool ExtensionWebRequestEventRouter::ProcessDeclarativeRules(
for (RelevantRegistries::iterator i = relevant_registries.begin();
i != relevant_registries.end(); ++i) {
extensions::WebRequestRulesRegistry* rules_registry = i->first;
- if (!rules_registry->ready().is_signaled()) {
+ const extensions::OneShotEvent* ready = rules_registry->ready();
+ if (ready && !ready->is_signaled()) {
// The rules registry is still loading. Block this request until it
// finishes.
- rules_registry->ready().Post(
+ ready->Post(
FROM_HERE,
base::Bind(&ExtensionWebRequestEventRouter::OnRulesRegistryReady,
AsWeakPtr(),

Powered by Google App Engine
This is Rietveld 408576698