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

Unified Diff: extensions/browser/extension_function.cc

Issue 2180253003: Ensure BrowserThread::CurrentlyOn is correct through MessageLoop teardown (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix that test for reals Created 4 years, 5 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 | « content/browser/browser_thread_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/browser/extension_function.cc
diff --git a/extensions/browser/extension_function.cc b/extensions/browser/extension_function.cc
index 8f737df200df1c93f460422afb50ebb1464137aa..49a005bf93f39ce8f7b50488e846c499cfbffbf3 100644
--- a/extensions/browser/extension_function.cc
+++ b/extensions/browser/extension_function.cc
@@ -478,8 +478,10 @@ UIThreadExtensionFunction::~UIThreadExtensionFunction() {
// shutting down.
// TODO(devlin): Duplicate this check in IOThreadExtensionFunction. It's
// tricky because checking IsShuttingDown has to be called from the UI thread.
- DCHECK(extensions::ExtensionsBrowserClient::Get()->IsShuttingDown() ||
- did_respond_ || ignore_all_did_respond_for_testing_do_not_use)
+ extensions::ExtensionsBrowserClient* browser_client =
+ extensions::ExtensionsBrowserClient::Get();
+ DCHECK(!browser_client || browser_client->IsShuttingDown() || did_respond_ ||
+ ignore_all_did_respond_for_testing_do_not_use)
<< name_;
}
« no previous file with comments | « content/browser/browser_thread_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698