OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "extensions/browser/extensions_test.h" | 5 #include "extensions/browser/extensions_test.h" |
6 | 6 |
7 #include "components/keyed_service/content/browser_context_dependency_manager.h" | 7 #include "components/keyed_service/content/browser_context_dependency_manager.h" |
8 #include "content/public/browser/content_browser_client.h" | 8 #include "content/public/browser/content_browser_client.h" |
9 #include "content/public/common/content_client.h" | 9 #include "content/public/common/content_client.h" |
10 #include "content/public/test/test_browser_context.h" | 10 #include "content/public/test/test_browser_context.h" |
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
48 BrowserContextDependencyManager::GetInstance() | 48 BrowserContextDependencyManager::GetInstance() |
49 ->CreateBrowserContextServicesForTest(browser_context_.get()); | 49 ->CreateBrowserContextServicesForTest(browser_context_.get()); |
50 } | 50 } |
51 | 51 |
52 void ExtensionsTest::TearDown() { | 52 void ExtensionsTest::TearDown() { |
53 // Allows individual tests to have BrowserContextKeyedServiceFactory objects | 53 // Allows individual tests to have BrowserContextKeyedServiceFactory objects |
54 // as member variables instead of singletons. The individual services will be | 54 // as member variables instead of singletons. The individual services will be |
55 // cleaned up before the factories are destroyed. | 55 // cleaned up before the factories are destroyed. |
56 BrowserContextDependencyManager::GetInstance()->DestroyBrowserContextServices( | 56 BrowserContextDependencyManager::GetInstance()->DestroyBrowserContextServices( |
57 browser_context_.get()); | 57 browser_context_.get()); |
| 58 extensions_browser_client_.reset(); |
| 59 browser_context_.reset(); |
58 } | 60 } |
59 | 61 |
60 } // namespace extensions | 62 } // namespace extensions |
OLD | NEW |