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

Unified Diff: extensions/browser/extensions_test.cc

Issue 428953003: Move LazyBackgroundTaskQueueTest into extensions_unittests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: (lazy-bg) rebase Created 6 years, 4 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
Index: extensions/browser/extensions_test.cc
diff --git a/extensions/browser/extensions_test.cc b/extensions/browser/extensions_test.cc
index 749b7007a0a4156467f9d72765b4dba82538e396..5b7a8ce486ae7966a356bd192e1c0c0d71779dd7 100644
--- a/extensions/browser/extensions_test.cc
+++ b/extensions/browser/extensions_test.cc
@@ -29,19 +29,26 @@ ExtensionsTest::ExtensionsTest()
content::SetContentClient(content_client_.get());
content::SetBrowserClientForTesting(content_browser_client_.get());
ExtensionsBrowserClient::Set(extensions_browser_client_.get());
+}
+
+ExtensionsTest::~ExtensionsTest() {
+ ExtensionsBrowserClient::Set(NULL);
+ content::SetBrowserClientForTesting(NULL);
+ content::SetContentClient(NULL);
+}
+void ExtensionsTest::SetUp() {
// Crashing here? Don't use this class in Chrome's unit_tests. See header.
BrowserContextDependencyManager::GetInstance()
->CreateBrowserContextServicesForTest(browser_context_.get());
}
-ExtensionsTest::~ExtensionsTest() {
+void ExtensionsTest::TearDown() {
+ // Allows individual tests to have BrowserContextKeyedServiceFactory objects
+ // as member variables instead of singletons. The individual services will be
+ // cleaned up before the factories are destroyed.
BrowserContextDependencyManager::GetInstance()->DestroyBrowserContextServices(
browser_context_.get());
-
- ExtensionsBrowserClient::Set(NULL);
- content::SetBrowserClientForTesting(NULL);
- content::SetContentClient(NULL);
}
} // namespace extensions

Powered by Google App Engine
This is Rietveld 408576698