summaryrefslogtreecommitdiffstats
path: root/chrome/browser/shell_integration.cc
diff options
context:
space:
mode:
authorwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-31 15:11:35 +0000
committerwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-31 15:11:35 +0000
commitbcb999db980e678755e59b8c85cb973df95614ab (patch)
treef8ef010fc98fb1ff710999f4017ede1bffcfdf35 /chrome/browser/shell_integration.cc
parent3fe73f16c7d40ba0331d23180401d5dd8cff9cc0 (diff)
downloadchromium_src-bcb999db980e678755e59b8c85cb973df95614ab.zip
chromium_src-bcb999db980e678755e59b8c85cb973df95614ab.tar.gz
chromium_src-bcb999db980e678755e59b8c85cb973df95614ab.tar.bz2
Fix memory leak in unit tests for ProtocolHandlerRegistry introduced by observers.
Unit tests need to call Finalize at teardown. This has an additional change to http://codereview.chromium.org/7080023/. BUG=83556 Review URL: http://codereview.chromium.org/7050035 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@87305 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/shell_integration.cc')
-rw-r--r--chrome/browser/shell_integration.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/chrome/browser/shell_integration.cc b/chrome/browser/shell_integration.cc
index fd0e035..c332965 100644
--- a/chrome/browser/shell_integration.cc
+++ b/chrome/browser/shell_integration.cc
@@ -92,6 +92,7 @@ void ShellIntegration::DefaultWebClientWorker::StartSetAsDefault() {
void ShellIntegration::DefaultWebClientWorker::ObserverDestroyed() {
// Our associated view has gone away, so we shouldn't call back to it if
// our worker thread returns after the view is dead.
+ DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
observer_ = NULL;
}