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

Side by Side Diff: chrome/browser/chromeos/policy/policy_cert_service_factory.cc

Issue 1870793002: Convert //chrome/browser/chromeos from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/policy/policy_cert_service_factory.h" 5 #include "chrome/browser/chromeos/policy/policy_cert_service_factory.h"
6 6
7 #include "base/memory/singleton.h" 7 #include "base/memory/singleton.h"
8 #include "chrome/browser/browser_process.h" 8 #include "chrome/browser/browser_process.h"
9 #include "chrome/browser/chromeos/policy/policy_cert_service.h" 9 #include "chrome/browser/chromeos/policy/policy_cert_service.h"
10 #include "chrome/browser/chromeos/policy/policy_cert_verifier.h" 10 #include "chrome/browser/chromeos/policy/policy_cert_verifier.h"
(...skipping 12 matching lines...) Expand all
23 23
24 namespace policy { 24 namespace policy {
25 25
26 // static 26 // static
27 PolicyCertService* PolicyCertServiceFactory::GetForProfile(Profile* profile) { 27 PolicyCertService* PolicyCertServiceFactory::GetForProfile(Profile* profile) {
28 return static_cast<PolicyCertService*>( 28 return static_cast<PolicyCertService*>(
29 GetInstance()->GetServiceForBrowserContext(profile, false)); 29 GetInstance()->GetServiceForBrowserContext(profile, false));
30 } 30 }
31 31
32 // static 32 // static
33 scoped_ptr<PolicyCertVerifier> PolicyCertServiceFactory::CreateForProfile( 33 std::unique_ptr<PolicyCertVerifier> PolicyCertServiceFactory::CreateForProfile(
34 Profile* profile) { 34 Profile* profile) {
35 DCHECK(!GetInstance()->GetServiceForBrowserContext(profile, false)); 35 DCHECK(!GetInstance()->GetServiceForBrowserContext(profile, false));
36 PolicyCertService* service = static_cast<PolicyCertService*>( 36 PolicyCertService* service = static_cast<PolicyCertService*>(
37 GetInstance()->GetServiceForBrowserContext(profile, true)); 37 GetInstance()->GetServiceForBrowserContext(profile, true));
38 if (!service) 38 if (!service)
39 return scoped_ptr<PolicyCertVerifier>(); 39 return std::unique_ptr<PolicyCertVerifier>();
40 return service->CreatePolicyCertVerifier(); 40 return service->CreatePolicyCertVerifier();
41 } 41 }
42 42
43 // static 43 // static
44 PolicyCertServiceFactory* PolicyCertServiceFactory::GetInstance() { 44 PolicyCertServiceFactory* PolicyCertServiceFactory::GetInstance() {
45 return base::Singleton<PolicyCertServiceFactory>::get(); 45 return base::Singleton<PolicyCertServiceFactory>::get();
46 } 46 }
47 47
48 // static 48 // static
49 void PolicyCertServiceFactory::SetUsedPolicyCertificates( 49 void PolicyCertServiceFactory::SetUsedPolicyCertificates(
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 // TODO(joaodasilva): this is used for backwards compatibility. 141 // TODO(joaodasilva): this is used for backwards compatibility.
142 // Remove once it's not necessary anymore. 142 // Remove once it's not necessary anymore.
143 registry->RegisterBooleanPref(prefs::kUsedPolicyCertificatesOnce, false); 143 registry->RegisterBooleanPref(prefs::kUsedPolicyCertificatesOnce, false);
144 } 144 }
145 145
146 bool PolicyCertServiceFactory::ServiceIsNULLWhileTesting() const { 146 bool PolicyCertServiceFactory::ServiceIsNULLWhileTesting() const {
147 return true; 147 return true;
148 } 148 }
149 149
150 } // namespace policy 150 } // namespace policy
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/policy/policy_cert_service_factory.h ('k') | chrome/browser/chromeos/policy/policy_cert_verifier.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698