summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authordarin@google.com <darin@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-27 06:33:18 +0000
committerdarin@google.com <darin@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-27 06:33:18 +0000
commit58273075f8cfb37ebfb3c71c3917c33a3d4cc3b5 (patch)
tree1bf7fe494cd4f889a4b386ae543293242eddcee5 /chrome
parent5ad44ca25ec7b90e0350ddf2c90d03672f1cd255 (diff)
downloadchromium_src-58273075f8cfb37ebfb3c71c3917c33a3d4cc3b5.zip
chromium_src-58273075f8cfb37ebfb3c71c3917c33a3d4cc3b5.tar.gz
chromium_src-58273075f8cfb37ebfb3c71c3917c33a3d4cc3b5.tar.bz2
Explicitly call RunAllPending in the Teardown phase a few more unit tests to
prevent Purify from complaining about these pending tasks as MLKs. TBR=erikkay git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1431 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/resource_dispatcher_host_unittest.cc3
-rw-r--r--chrome/browser/template_url_model_unittest.cc3
-rw-r--r--chrome/common/chrome_plugin_unittest.cc3
-rw-r--r--chrome/views/focus_manager_unittest.cc3
4 files changed, 12 insertions, 0 deletions
diff --git a/chrome/browser/resource_dispatcher_host_unittest.cc b/chrome/browser/resource_dispatcher_host_unittest.cc
index 101e9f7..72b837d 100644
--- a/chrome/browser/resource_dispatcher_host_unittest.cc
+++ b/chrome/browser/resource_dispatcher_host_unittest.cc
@@ -101,6 +101,9 @@ class ResourceDispatcherHostTest : public testing::Test,
virtual void TearDown() {
URLRequest::RegisterProtocolFactory("test", NULL);
RendererSecurityPolicy::GetInstance()->Remove(0);
+
+ // Flush the message loop to make Purify happy.
+ message_loop_.RunAllPending();
}
void MakeTestRequest(int request_id, const GURL& url);
diff --git a/chrome/browser/template_url_model_unittest.cc b/chrome/browser/template_url_model_unittest.cc
index d0239df..b81e892 100644
--- a/chrome/browser/template_url_model_unittest.cc
+++ b/chrome/browser/template_url_model_unittest.cc
@@ -111,6 +111,9 @@ class TemplateURLModelTest : public testing::Test,
profile_->TearDown();
delete TemplateURLRef::google_base_url_;
TemplateURLRef::google_base_url_ = NULL;
+
+ // Flush the message loop to make Purify happy.
+ message_loop_.RunAllPending();
}
TemplateURL* AddKeywordWithDate(const std::wstring& keyword,
diff --git a/chrome/common/chrome_plugin_unittest.cc b/chrome/common/chrome_plugin_unittest.cc
index f998755..7c6650e 100644
--- a/chrome/common/chrome_plugin_unittest.cc
+++ b/chrome/common/chrome_plugin_unittest.cc
@@ -60,6 +60,9 @@ class ChromePluginTest : public testing::Test, public URLRequest::Delegate {
URLRequest::RegisterProtocolFactory("test", NULL);
Profile::set_default_request_context(NULL);
+
+ // Flush the message loop to make Purify happy.
+ message_loop_.RunAllPending();
}
protected:
MessageLoopForIO message_loop_;
diff --git a/chrome/views/focus_manager_unittest.cc b/chrome/views/focus_manager_unittest.cc
index 841f738..dd3405c 100644
--- a/chrome/views/focus_manager_unittest.cc
+++ b/chrome/views/focus_manager_unittest.cc
@@ -521,6 +521,9 @@ void FocusManagerTest::SetUp() {
void FocusManagerTest::TearDown() {
test_window_->CloseNow();
+
+ // Flush the message loop to make Purify happy.
+ message_loop_.RunAllPending();
}
////////////////////////////////////////////////////////////////////////////////