summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome_frame/com_type_info_holder.cc1
-rw-r--r--chrome_frame/test/net/fake_external_tab.cc3
2 files changed, 3 insertions, 1 deletions
diff --git a/chrome_frame/com_type_info_holder.cc b/chrome_frame/com_type_info_holder.cc
index a018f81..d95fd41 100644
--- a/chrome_frame/com_type_info_holder.cc
+++ b/chrome_frame/com_type_info_holder.cc
@@ -38,6 +38,7 @@ TypeInfoNameCache* TypeInfoCache::Lookup(const IID* iid) {
} else {
NOTREACHED();
delete tih;
+ tih = NULL;
}
} else {
tih = it->second;
diff --git a/chrome_frame/test/net/fake_external_tab.cc b/chrome_frame/test/net/fake_external_tab.cc
index 78430fe..9ada450 100644
--- a/chrome_frame/test/net/fake_external_tab.cc
+++ b/chrome_frame/test/net/fake_external_tab.cc
@@ -146,7 +146,8 @@ CFUrlRequestUnittestRunner::CFUrlRequestUnittestRunner(int argc, char** argv)
EXPECT_TRUE(pss_subclass_->Subclass(fake_chrome_.user_data()));
StartChromeFrameInHostBrowser();
// Register the main thread by instantiating it, but don't call any methods.
- main_thread_.reset(new ChromeThread(ChromeThread::UI));
+ main_thread_.reset(new ChromeThread(ChromeThread::UI,
+ MessageLoop::current()));
DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
}