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

Side by Side Diff: extensions/browser/extensions_test.cc

Issue 2802433004: ExtensionsTest: Move initialization to SetUp and avoid potential UAF. (Closed)
Patch Set: Created 3 years, 8 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 unified diff | Download patch
OLDNEW
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 "base/memory/ptr_util.h"
7 #include "components/keyed_service/content/browser_context_dependency_manager.h" 8 #include "components/keyed_service/content/browser_context_dependency_manager.h"
8 #include "components/pref_registry/pref_registry_syncable.h" 9 #include "components/pref_registry/pref_registry_syncable.h"
9 #include "components/prefs/pref_service_factory.h" 10 #include "components/prefs/pref_service_factory.h"
10 #include "components/prefs/testing_pref_store.h" 11 #include "components/prefs/testing_pref_store.h"
11 #include "content/public/browser/content_browser_client.h" 12 #include "content/public/browser/content_browser_client.h"
12 #include "content/public/common/content_client.h" 13 #include "content/public/common/content_client.h"
13 #include "content/public/test/test_browser_context.h" 14 #include "content/public/test/test_browser_context.h"
14 #include "extensions/browser/extension_pref_value_map.h" 15 #include "extensions/browser/extension_pref_value_map.h"
15 #include "extensions/browser/extension_prefs.h" 16 #include "extensions/browser/extension_prefs.h"
16 #include "extensions/browser/extension_prefs_factory.h" 17 #include "extensions/browser/extension_prefs_factory.h"
17 #include "extensions/browser/test_extensions_browser_client.h" 18 #include "extensions/browser/test_extensions_browser_client.h"
18 #include "extensions/test/test_content_browser_client.h" 19 #include "extensions/test/test_content_browser_client.h"
19 #include "extensions/test/test_content_utility_client.h" 20 #include "extensions/test/test_content_utility_client.h"
20 21
21 namespace { 22 namespace {
22 23
23 std::unique_ptr<content::TestBrowserContext> CreateTestIncognitoContext() { 24 std::unique_ptr<content::TestBrowserContext> CreateTestIncognitoContext() {
24 std::unique_ptr<content::TestBrowserContext> incognito_context( 25 std::unique_ptr<content::TestBrowserContext> incognito_context(
25 new content::TestBrowserContext); 26 new content::TestBrowserContext);
26 incognito_context->SetOffTheRecord(true); 27 incognito_context->SetOffTheRecord(true);
27 return incognito_context; 28 return incognito_context;
28 } 29 }
29 30
30 } // namespace 31 } // namespace
31 32
32 namespace extensions { 33 namespace extensions {
33 34
34 // This class does work in the constructor instead of SetUp() to give subclasses 35 ExtensionsTest::ExtensionsTest() {}
35 // a valid BrowserContext to use while initializing their members. For example: 36
36 // 37 ExtensionsTest::~ExtensionsTest() {}
37 // class MyExtensionsTest : public ExtensionsTest { 38
38 // MyExtensionsTest() 39 void ExtensionsTest::SetUp() {
39 // : my_object_(browser_context())) { 40 content_browser_client_ = base::MakeUnique<TestContentBrowserClient>();
40 // } 41 content_utility_client_ = base::MakeUnique<TestContentUtilityClient>();
41 // }; 42 browser_context_ = base::MakeUnique<content::TestBrowserContext>();
42 // TODO(crbug.com/708256): All these instances are setup in the constructor, but 43 incognito_context_ = CreateTestIncognitoContext();
43 // destroyed in TearDown(), which may cause problems. Move this initialization 44 extensions_browser_client_ =
44 // to SetUp(). 45 base::MakeUnique<TestExtensionsBrowserClient>(browser_context_.get());
45 ExtensionsTest::ExtensionsTest() 46
46 : content_browser_client_(new TestContentBrowserClient),
47 content_utility_client_(new TestContentUtilityClient),
48 browser_context_(new content::TestBrowserContext),
49 incognito_context_(CreateTestIncognitoContext()),
50 extensions_browser_client_(
51 new TestExtensionsBrowserClient(browser_context_.get())) {
52 content::SetBrowserClientForTesting(content_browser_client_.get()); 47 content::SetBrowserClientForTesting(content_browser_client_.get());
53 content::SetUtilityClientForTesting(content_utility_client_.get()); 48 content::SetUtilityClientForTesting(content_utility_client_.get());
54 ExtensionsBrowserClient::Set(extensions_browser_client_.get()); 49 ExtensionsBrowserClient::Set(extensions_browser_client_.get());
55 extensions_browser_client_->set_extension_system_factory( 50 extensions_browser_client_->set_extension_system_factory(
56 &extension_system_factory_); 51 &extension_system_factory_);
57 extensions_browser_client_->SetIncognitoContext(incognito_context_.get()); 52 extensions_browser_client_->SetIncognitoContext(incognito_context_.get());
58 53
59 // Set up all the dependencies of ExtensionPrefs. 54 // Set up all the dependencies of ExtensionPrefs.
60 extension_pref_value_map_.reset(new ExtensionPrefValueMap()); 55 extension_pref_value_map_.reset(new ExtensionPrefValueMap());
61 PrefServiceFactory factory; 56 PrefServiceFactory factory;
62 factory.set_user_prefs(new TestingPrefStore()); 57 factory.set_user_prefs(new TestingPrefStore());
63 factory.set_extension_prefs(new TestingPrefStore()); 58 factory.set_extension_prefs(new TestingPrefStore());
64 user_prefs::PrefRegistrySyncable* pref_registry = 59 user_prefs::PrefRegistrySyncable* pref_registry =
65 new user_prefs::PrefRegistrySyncable(); 60 new user_prefs::PrefRegistrySyncable();
66 // Prefs should be registered before the PrefService is created. 61 // Prefs should be registered before the PrefService is created.
67 ExtensionPrefs::RegisterProfilePrefs(pref_registry); 62 ExtensionPrefs::RegisterProfilePrefs(pref_registry);
68 pref_service_ = factory.Create(pref_registry); 63 pref_service_ = factory.Create(pref_registry);
69 64
70 std::unique_ptr<ExtensionPrefs> extension_prefs(ExtensionPrefs::Create( 65 std::unique_ptr<ExtensionPrefs> extension_prefs(ExtensionPrefs::Create(
71 browser_context(), pref_service_.get(), 66 browser_context(), pref_service_.get(),
72 browser_context()->GetPath().AppendASCII("Extensions"), 67 browser_context()->GetPath().AppendASCII("Extensions"),
73 extension_pref_value_map_.get(), false /* extensions_disabled */, 68 extension_pref_value_map_.get(), false /* extensions_disabled */,
74 std::vector<ExtensionPrefsObserver*>())); 69 std::vector<ExtensionPrefsObserver*>()));
75 70
76 ExtensionPrefsFactory::GetInstance()->SetInstanceForTesting( 71 ExtensionPrefsFactory::GetInstance()->SetInstanceForTesting(
77 browser_context(), std::move(extension_prefs)); 72 browser_context(), std::move(extension_prefs));
78 }
79 73
80 ExtensionsTest::~ExtensionsTest() {
81 ExtensionsBrowserClient::Set(nullptr);
82 content::SetBrowserClientForTesting(nullptr);
83 content::SetUtilityClientForTesting(nullptr);
84 }
85
86 void ExtensionsTest::SetUp() {
87 // Crashing here? Don't use this class in Chrome's unit_tests. See header. 74 // Crashing here? Don't use this class in Chrome's unit_tests. See header.
88 BrowserContextDependencyManager::GetInstance() 75 BrowserContextDependencyManager::GetInstance()
89 ->CreateBrowserContextServicesForTest(browser_context_.get()); 76 ->CreateBrowserContextServicesForTest(browser_context_.get());
90 } 77 }
91 78
92 void ExtensionsTest::TearDown() { 79 void ExtensionsTest::TearDown() {
93 // Allows individual tests to have BrowserContextKeyedServiceFactory objects 80 // Allows individual tests to have BrowserContextKeyedServiceFactory objects
94 // as member variables instead of singletons. The individual services will be 81 // as member variables instead of singletons. The individual services will be
95 // cleaned up before the factories are destroyed. 82 // cleaned up before the factories are destroyed.
96 BrowserContextDependencyManager::GetInstance()->DestroyBrowserContextServices( 83 BrowserContextDependencyManager::GetInstance()->DestroyBrowserContextServices(
97 browser_context_.get()); 84 browser_context_.get());
98 85
99 // TODO(crbug.com/708256): |extension_browser_client_| is reset here but not
100 // unset as the singleton until the destructor. This can lead to use after
101 // free errors.
102 extensions_browser_client_.reset(); 86 extensions_browser_client_.reset();
103 browser_context_.reset(); 87 browser_context_.reset();
104 incognito_context_.reset(); 88 incognito_context_.reset();
105 pref_service_.reset(); 89 pref_service_.reset();
90
91 ExtensionsBrowserClient::Set(nullptr);
92 content::SetBrowserClientForTesting(nullptr);
93 content::SetUtilityClientForTesting(nullptr);
106 } 94 }
107 95
108 } // namespace extensions 96 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698