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

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

Issue 1165913002: [Cleanup] Used scoped pointers in KeyedServiceFactory's SetTestingFactory functions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Finish renaming profile -> context Created 5 years, 6 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 "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/prefs/pref_service.h" 6 #include "base/prefs/pref_service.h"
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/browser_context.h" 8 #include "content/public/browser/browser_context.h"
9 #include "extensions/browser/extension_pref_value_map.h" 9 #include "extensions/browser/extension_pref_value_map.h"
10 #include "extensions/browser/extension_pref_value_map_factory.h" 10 #include "extensions/browser/extension_pref_value_map_factory.h"
(...skipping 10 matching lines...) Expand all
21 return static_cast<ExtensionPrefs*>( 21 return static_cast<ExtensionPrefs*>(
22 GetInstance()->GetServiceForBrowserContext(context, true)); 22 GetInstance()->GetServiceForBrowserContext(context, true));
23 } 23 }
24 24
25 // static 25 // static
26 ExtensionPrefsFactory* ExtensionPrefsFactory::GetInstance() { 26 ExtensionPrefsFactory* ExtensionPrefsFactory::GetInstance() {
27 return Singleton<ExtensionPrefsFactory>::get(); 27 return Singleton<ExtensionPrefsFactory>::get();
28 } 28 }
29 29
30 void ExtensionPrefsFactory::SetInstanceForTesting( 30 void ExtensionPrefsFactory::SetInstanceForTesting(
31 content::BrowserContext* context, ExtensionPrefs* prefs) { 31 content::BrowserContext* context,
32 Associate(context, prefs); 32 scoped_ptr<ExtensionPrefs> prefs) {
33 Associate(context, prefs.Pass());
33 } 34 }
34 35
35 ExtensionPrefsFactory::ExtensionPrefsFactory() 36 ExtensionPrefsFactory::ExtensionPrefsFactory()
36 : BrowserContextKeyedServiceFactory( 37 : BrowserContextKeyedServiceFactory(
37 "ExtensionPrefs", 38 "ExtensionPrefs",
38 BrowserContextDependencyManager::GetInstance()) { 39 BrowserContextDependencyManager::GetInstance()) {
39 } 40 }
40 41
41 ExtensionPrefsFactory::~ExtensionPrefsFactory() { 42 ExtensionPrefsFactory::~ExtensionPrefsFactory() {
42 } 43 }
(...skipping 12 matching lines...) Expand all
55 context), 56 context),
56 prefs_observers); 57 prefs_observers);
57 } 58 }
58 59
59 content::BrowserContext* ExtensionPrefsFactory::GetBrowserContextToUse( 60 content::BrowserContext* ExtensionPrefsFactory::GetBrowserContextToUse(
60 content::BrowserContext* context) const { 61 content::BrowserContext* context) const {
61 return ExtensionsBrowserClient::Get()->GetOriginalContext(context); 62 return ExtensionsBrowserClient::Get()->GetOriginalContext(context);
62 } 63 }
63 64
64 } // namespace extensions 65 } // namespace extensions
OLDNEW
« no previous file with comments | « extensions/browser/extension_prefs_factory.h ('k') | extensions/browser/lazy_background_task_queue_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698