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

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

Issue 864093002: Move sandboxed_unpacker.{h,cc} from chrome/ to extensions/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix compile errors Created 5 years, 11 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
« no previous file with comments | « extensions/browser/extensions_test.h ('k') | extensions/browser/sandboxed_unpacker.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "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"
11 #include "extensions/browser/test_extensions_browser_client.h" 11 #include "extensions/browser/test_extensions_browser_client.h"
12 #include "extensions/test/test_content_utility_client.h"
12 13
13 namespace extensions { 14 namespace extensions {
14 15
15 // This class does work in the constructor instead of SetUp() to give subclasses 16 // This class does work in the constructor instead of SetUp() to give subclasses
16 // a valid BrowserContext to use while initializing their members. For example: 17 // a valid BrowserContext to use while initializing their members. For example:
17 // 18 //
18 // class MyExtensionsTest : public ExtensionsTest { 19 // class MyExtensionsTest : public ExtensionsTest {
19 // MyExtensionsTest() 20 // MyExtensionsTest()
20 // : my_object_(browser_context())) { 21 // : my_object_(browser_context())) {
21 // } 22 // }
22 // }; 23 // };
23 ExtensionsTest::ExtensionsTest() 24 ExtensionsTest::ExtensionsTest()
24 : content_client_(new content::ContentClient), 25 : content_client_(new content::ContentClient),
26 content_utility_client_(new TestContentUtilityClient),
25 content_browser_client_(new content::ContentBrowserClient), 27 content_browser_client_(new content::ContentBrowserClient),
26 browser_context_(new content::TestBrowserContext), 28 browser_context_(new content::TestBrowserContext),
27 extensions_browser_client_( 29 extensions_browser_client_(
28 new TestExtensionsBrowserClient(browser_context_.get())) { 30 new TestExtensionsBrowserClient(browser_context_.get())) {
29 content::SetContentClient(content_client_.get()); 31 content::SetContentClient(content_client_.get());
32 content::SetUtilityClientForTesting(content_utility_client_.get());
30 content::SetBrowserClientForTesting(content_browser_client_.get()); 33 content::SetBrowserClientForTesting(content_browser_client_.get());
31 ExtensionsBrowserClient::Set(extensions_browser_client_.get()); 34 ExtensionsBrowserClient::Set(extensions_browser_client_.get());
32 } 35 }
33 36
34 ExtensionsTest::~ExtensionsTest() { 37 ExtensionsTest::~ExtensionsTest() {
35 ExtensionsBrowserClient::Set(NULL); 38 ExtensionsBrowserClient::Set(NULL);
36 content::SetBrowserClientForTesting(NULL); 39 content::SetBrowserClientForTesting(NULL);
40 content::SetUtilityClientForTesting(NULL);
37 content::SetContentClient(NULL); 41 content::SetContentClient(NULL);
38 } 42 }
39 43
40 void ExtensionsTest::SetUp() { 44 void ExtensionsTest::SetUp() {
41 // Crashing here? Don't use this class in Chrome's unit_tests. See header. 45 // Crashing here? Don't use this class in Chrome's unit_tests. See header.
42 BrowserContextDependencyManager::GetInstance() 46 BrowserContextDependencyManager::GetInstance()
43 ->CreateBrowserContextServicesForTest(browser_context_.get()); 47 ->CreateBrowserContextServicesForTest(browser_context_.get());
44 } 48 }
45 49
46 void ExtensionsTest::TearDown() { 50 void ExtensionsTest::TearDown() {
47 // Allows individual tests to have BrowserContextKeyedServiceFactory objects 51 // Allows individual tests to have BrowserContextKeyedServiceFactory objects
48 // as member variables instead of singletons. The individual services will be 52 // as member variables instead of singletons. The individual services will be
49 // cleaned up before the factories are destroyed. 53 // cleaned up before the factories are destroyed.
50 BrowserContextDependencyManager::GetInstance()->DestroyBrowserContextServices( 54 BrowserContextDependencyManager::GetInstance()->DestroyBrowserContextServices(
51 browser_context_.get()); 55 browser_context_.get());
52 } 56 }
53 57
54 } // namespace extensions 58 } // namespace extensions
OLDNEW
« no previous file with comments | « extensions/browser/extensions_test.h ('k') | extensions/browser/sandboxed_unpacker.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698