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

Side by Side Diff: chrome/browser/chromeos/ownership/owner_settings_service_chromeos_factory.cc

Issue 654263003: Implemented OwnerSettingsService::Set() method. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed crashes under asan. Created 6 years, 1 month 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 "chrome/browser/chromeos/ownership/owner_settings_service_chromeos_fact ory.h" 5 #include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos_fact ory.h"
6 6
7 #include "base/path_service.h" 7 #include "base/path_service.h"
8 #include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos.h" 8 #include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos.h"
9 #include "chrome/browser/chromeos/profiles/profile_helper.h" 9 #include "chrome/browser/chromeos/profiles/profile_helper.h"
10 #include "chrome/browser/chromeos/settings/device_settings_service.h"
10 #include "chrome/browser/profiles/profile.h" 11 #include "chrome/browser/profiles/profile.h"
11 #include "chromeos/chromeos_paths.h" 12 #include "chromeos/chromeos_paths.h"
12 #include "components/keyed_service/content/browser_context_dependency_manager.h" 13 #include "components/keyed_service/content/browser_context_dependency_manager.h"
13 #include "components/ownership/owner_key_util.h" 14 #include "components/ownership/owner_key_util.h"
14 #include "components/ownership/owner_key_util_impl.h" 15 #include "components/ownership/owner_key_util_impl.h"
15 16
16 namespace chromeos { 17 namespace chromeos {
17 18
19 namespace {
20
21 DeviceSettingsService* g_device_settings_service_for_testing_ = nullptr;
22
23 DeviceSettingsService* GetDeviceSettingsService() {
24 if (g_device_settings_service_for_testing_)
25 return g_device_settings_service_for_testing_;
26 return DeviceSettingsService::IsInitialized() ? DeviceSettingsService::Get()
27 : nullptr;
28 }
29
30 } // namespace
31
18 OwnerSettingsServiceChromeOSFactory::OwnerSettingsServiceChromeOSFactory() 32 OwnerSettingsServiceChromeOSFactory::OwnerSettingsServiceChromeOSFactory()
19 : BrowserContextKeyedServiceFactory( 33 : BrowserContextKeyedServiceFactory(
20 "OwnerSettingsService", 34 "OwnerSettingsService",
21 BrowserContextDependencyManager::GetInstance()) { 35 BrowserContextDependencyManager::GetInstance()) {
22 } 36 }
23 37
24 OwnerSettingsServiceChromeOSFactory::~OwnerSettingsServiceChromeOSFactory() { 38 OwnerSettingsServiceChromeOSFactory::~OwnerSettingsServiceChromeOSFactory() {
25 } 39 }
26 40
27 // static 41 // static
28 OwnerSettingsServiceChromeOS* 42 OwnerSettingsServiceChromeOS*
29 OwnerSettingsServiceChromeOSFactory::GetForProfile(Profile* profile) { 43 OwnerSettingsServiceChromeOSFactory::GetForProfile(Profile* profile) {
30 return static_cast<OwnerSettingsServiceChromeOS*>( 44 return static_cast<OwnerSettingsServiceChromeOS*>(
31 GetInstance()->GetServiceForBrowserContext(profile, true)); 45 GetInstance()->GetServiceForBrowserContext(profile, true));
32 } 46 }
33 47
34 // static 48 // static
35 OwnerSettingsServiceChromeOSFactory* 49 OwnerSettingsServiceChromeOSFactory*
36 OwnerSettingsServiceChromeOSFactory::GetInstance() { 50 OwnerSettingsServiceChromeOSFactory::GetInstance() {
37 return Singleton<OwnerSettingsServiceChromeOSFactory>::get(); 51 return Singleton<OwnerSettingsServiceChromeOSFactory>::get();
38 } 52 }
39 53
54 // static
55 void OwnerSettingsServiceChromeOSFactory::SetDeviceSettingsServiceForTesting(
56 DeviceSettingsService* device_settings_service) {
57 g_device_settings_service_for_testing_ = device_settings_service;
58 }
59
40 scoped_refptr<ownership::OwnerKeyUtil> 60 scoped_refptr<ownership::OwnerKeyUtil>
41 OwnerSettingsServiceChromeOSFactory::GetOwnerKeyUtil() { 61 OwnerSettingsServiceChromeOSFactory::GetOwnerKeyUtil() {
42 if (owner_key_util_.get()) 62 if (owner_key_util_.get())
43 return owner_key_util_; 63 return owner_key_util_;
44 base::FilePath public_key_path; 64 base::FilePath public_key_path;
45 if (!PathService::Get(chromeos::FILE_OWNER_KEY, &public_key_path)) 65 if (!PathService::Get(chromeos::FILE_OWNER_KEY, &public_key_path))
46 return NULL; 66 return NULL;
47 owner_key_util_ = new ownership::OwnerKeyUtilImpl(public_key_path); 67 owner_key_util_ = new ownership::OwnerKeyUtilImpl(public_key_path);
48 return owner_key_util_; 68 return owner_key_util_;
49 } 69 }
50 70
51 void OwnerSettingsServiceChromeOSFactory::SetOwnerKeyUtilForTesting( 71 void OwnerSettingsServiceChromeOSFactory::SetOwnerKeyUtilForTesting(
52 const scoped_refptr<ownership::OwnerKeyUtil>& owner_key_util) { 72 const scoped_refptr<ownership::OwnerKeyUtil>& owner_key_util) {
53 owner_key_util_ = owner_key_util; 73 owner_key_util_ = owner_key_util;
54 } 74 }
55 75
56 // static 76 // static
57 KeyedService* OwnerSettingsServiceChromeOSFactory::BuildInstanceFor( 77 KeyedService* OwnerSettingsServiceChromeOSFactory::BuildInstanceFor(
58 content::BrowserContext* browser_context) { 78 content::BrowserContext* browser_context) {
59 Profile* profile = static_cast<Profile*>(browser_context); 79 Profile* profile = static_cast<Profile*>(browser_context);
60 if (profile->IsGuestSession() || ProfileHelper::IsSigninProfile(profile)) 80 if (profile->IsGuestSession() || ProfileHelper::IsSigninProfile(profile))
61 return NULL; 81 return NULL;
62 return new OwnerSettingsServiceChromeOS(profile, 82 return new OwnerSettingsServiceChromeOS(
63 GetInstance()->GetOwnerKeyUtil()); 83 GetDeviceSettingsService(),
84 profile,
85 GetInstance()->GetOwnerKeyUtil());
64 } 86 }
65 87
66 bool OwnerSettingsServiceChromeOSFactory::ServiceIsCreatedWithBrowserContext() 88 bool OwnerSettingsServiceChromeOSFactory::ServiceIsCreatedWithBrowserContext()
67 const { 89 const {
68 return true; 90 return true;
69 } 91 }
70 92
71 KeyedService* OwnerSettingsServiceChromeOSFactory::BuildServiceInstanceFor( 93 KeyedService* OwnerSettingsServiceChromeOSFactory::BuildServiceInstanceFor(
72 content::BrowserContext* context) const { 94 content::BrowserContext* context) const {
73 return BuildInstanceFor(context); 95 return BuildInstanceFor(context);
74 } 96 }
75 97
76 } // namespace chromeos 98 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698