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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/extensions/api/dns/dns_apitest.cc

Issue 419523003: Relands "Removed InProcessBrowserTest::CleanUpOnMainThread()" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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 | « chrome/browser/extensions/api/content_settings/content_settings_apitest.cc ('k') | chrome/browser/extensions/api/preference/preference_apitest.cc » ('j') | chrome/browser/sessions/session_restore_browsertest_chromeos.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/api/dns/dns_apitest.cc
diff --git a/chrome/browser/extensions/api/dns/dns_apitest.cc b/chrome/browser/extensions/api/dns/dns_apitest.cc
index 52448cac3fe238fd9114f2d63233843244b1f31c..8bb70ac41e36850b4c94bd292317e7f111051738 100644
--- a/chrome/browser/extensions/api/dns/dns_apitest.cc
+++ b/chrome/browser/extensions/api/dns/dns_apitest.cc
@@ -19,11 +19,11 @@ class DnsApiTest : public ExtensionApiTest {
resolver_creator_->CreateMockHostResolver());
}
- virtual void CleanUpOnMainThread() OVERRIDE {
+ virtual void TearDownOnMainThread() OVERRIDE {
extensions::HostResolverWrapper::GetInstance()->
SetHostResolverForTesting(NULL);
resolver_creator_->DeleteMockHostResolver();
- ExtensionApiTest::CleanUpOnMainThread();
+ ExtensionApiTest::TearDownOnMainThread();
}
// The MockHostResolver asserts that it's used on the same thread on which
« no previous file with comments | « chrome/browser/extensions/api/content_settings/content_settings_apitest.cc ('k') | chrome/browser/extensions/api/preference/preference_apitest.cc » ('j') | chrome/browser/sessions/session_restore_browsertest_chromeos.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698