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 "components/pref_registry/pref_registry_syncable.h" | |
9 #include "components/prefs/pref_service_factory.h" | |
10 #include "components/prefs/testing_pref_store.h" | |
8 #include "content/public/browser/content_browser_client.h" | 11 #include "content/public/browser/content_browser_client.h" |
9 #include "content/public/common/content_client.h" | 12 #include "content/public/common/content_client.h" |
10 #include "content/public/test/test_browser_context.h" | 13 #include "content/public/test/test_browser_context.h" |
14 #include "extensions/browser/extension_pref_value_map.h" | |
15 #include "extensions/browser/extension_prefs.h" | |
16 #include "extensions/browser/extension_prefs_factory.h" | |
11 #include "extensions/browser/test_extensions_browser_client.h" | 17 #include "extensions/browser/test_extensions_browser_client.h" |
12 #include "extensions/test/test_content_browser_client.h" | 18 #include "extensions/test/test_content_browser_client.h" |
13 #include "extensions/test/test_content_utility_client.h" | 19 #include "extensions/test/test_content_utility_client.h" |
14 | 20 |
15 namespace extensions { | 21 namespace extensions { |
16 | 22 |
17 // This class does work in the constructor instead of SetUp() to give subclasses | 23 // This class does work in the constructor instead of SetUp() to give subclasses |
Devlin
2017/04/04 14:18:11
This isn't related to this patch set at all, but t
karandeepb
2017/04/04 19:16:42
Filed a bug and added a TODO.
| |
18 // a valid BrowserContext to use while initializing their members. For example: | 24 // a valid BrowserContext to use while initializing their members. For example: |
19 // | 25 // |
20 // class MyExtensionsTest : public ExtensionsTest { | 26 // class MyExtensionsTest : public ExtensionsTest { |
21 // MyExtensionsTest() | 27 // MyExtensionsTest() |
22 // : my_object_(browser_context())) { | 28 // : my_object_(browser_context())) { |
23 // } | 29 // } |
24 // }; | 30 // }; |
25 ExtensionsTest::ExtensionsTest() | 31 ExtensionsTest::ExtensionsTest() |
26 : content_browser_client_(new TestContentBrowserClient), | 32 : content_browser_client_(new TestContentBrowserClient), |
27 content_utility_client_(new TestContentUtilityClient), | 33 content_utility_client_(new TestContentUtilityClient), |
28 browser_context_(new content::TestBrowserContext), | 34 browser_context_(new content::TestBrowserContext), |
35 incognito_context_(new content::TestBrowserContextIncognito), | |
Devlin
2017/04/04 14:18:11
I wonder if we should create this as-needed instea
karandeepb
2017/04/04 19:00:37
I don't see any harm in creating one by default. T
Devlin
2017/04/04 19:04:15
My concern is whether the instantiation has side e
karandeepb
2017/04/04 19:16:42
One side effect(desired) is that ExtensionsBrowser
| |
29 extensions_browser_client_( | 36 extensions_browser_client_( |
30 new TestExtensionsBrowserClient(browser_context_.get())) { | 37 new TestExtensionsBrowserClient(browser_context_.get())) { |
31 content::SetBrowserClientForTesting(content_browser_client_.get()); | 38 content::SetBrowserClientForTesting(content_browser_client_.get()); |
32 content::SetUtilityClientForTesting(content_utility_client_.get()); | 39 content::SetUtilityClientForTesting(content_utility_client_.get()); |
33 ExtensionsBrowserClient::Set(extensions_browser_client_.get()); | 40 ExtensionsBrowserClient::Set(extensions_browser_client_.get()); |
34 extensions_browser_client_->set_extension_system_factory( | 41 extensions_browser_client_->set_extension_system_factory( |
35 &extension_system_factory_); | 42 &extension_system_factory_); |
43 extensions_browser_client_->SetIncognitoContext(incognito_context_.get()); | |
44 | |
45 // Set up all the dependencies of ExtensionPrefs. | |
46 extension_pref_value_map_.reset(new ExtensionPrefValueMap()); | |
47 PrefServiceFactory factory; | |
48 factory.set_user_prefs(new TestingPrefStore()); | |
49 factory.set_extension_prefs(new TestingPrefStore()); | |
50 user_prefs::PrefRegistrySyncable* pref_registry = | |
51 new user_prefs::PrefRegistrySyncable(); | |
52 // Prefs should be registered before the PrefService is created. | |
53 ExtensionPrefs::RegisterProfilePrefs(pref_registry); | |
54 pref_service_ = factory.Create(pref_registry); | |
55 | |
56 std::unique_ptr<ExtensionPrefs> extension_prefs(ExtensionPrefs::Create( | |
57 browser_context(), pref_service_.get(), | |
58 browser_context()->GetPath().AppendASCII("Extensions"), | |
59 extension_pref_value_map_.get(), false /* extensions_disabled */, | |
60 std::vector<ExtensionPrefsObserver*>())); | |
61 | |
62 ExtensionPrefsFactory::GetInstance()->SetInstanceForTesting( | |
63 browser_context(), std::move(extension_prefs)); | |
36 } | 64 } |
37 | 65 |
38 ExtensionsTest::~ExtensionsTest() { | 66 ExtensionsTest::~ExtensionsTest() { |
39 ExtensionsBrowserClient::Set(nullptr); | 67 ExtensionsBrowserClient::Set(nullptr); |
40 content::SetBrowserClientForTesting(nullptr); | 68 content::SetBrowserClientForTesting(nullptr); |
41 content::SetUtilityClientForTesting(nullptr); | 69 content::SetUtilityClientForTesting(nullptr); |
42 } | 70 } |
43 | 71 |
44 void ExtensionsTest::SetUp() { | 72 void ExtensionsTest::SetUp() { |
45 // Crashing here? Don't use this class in Chrome's unit_tests. See header. | 73 // Crashing here? Don't use this class in Chrome's unit_tests. See header. |
46 BrowserContextDependencyManager::GetInstance() | 74 BrowserContextDependencyManager::GetInstance() |
47 ->CreateBrowserContextServicesForTest(browser_context_.get()); | 75 ->CreateBrowserContextServicesForTest(browser_context_.get()); |
48 } | 76 } |
49 | 77 |
50 void ExtensionsTest::TearDown() { | 78 void ExtensionsTest::TearDown() { |
51 // Allows individual tests to have BrowserContextKeyedServiceFactory objects | 79 // Allows individual tests to have BrowserContextKeyedServiceFactory objects |
Devlin
2017/04/04 14:18:11
This seems to be in direct violation of a comment
karandeepb
2017/04/04 19:16:42
Removed the comment.
| |
52 // as member variables instead of singletons. The individual services will be | 80 // as member variables instead of singletons. The individual services will be |
53 // cleaned up before the factories are destroyed. | 81 // cleaned up before the factories are destroyed. |
54 BrowserContextDependencyManager::GetInstance()->DestroyBrowserContextServices( | 82 BrowserContextDependencyManager::GetInstance()->DestroyBrowserContextServices( |
55 browser_context_.get()); | 83 browser_context_.get()); |
56 extensions_browser_client_.reset(); | 84 extensions_browser_client_.reset(); |
Devlin
2017/04/04 14:18:11
We initialize this in the ctor, but destroy it in
karandeepb
2017/04/04 19:16:42
Added a TODO.
| |
57 browser_context_.reset(); | 85 browser_context_.reset(); |
86 incognito_context_.reset(); | |
58 } | 87 } |
59 | 88 |
60 } // namespace extensions | 89 } // namespace extensions |
OLD | NEW |