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

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

Issue 1165323004: We should use UserID object to identify users instead of username. Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 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.h" 5 #include "chrome/browser/chromeos/policy/policy_cert_service.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "chrome/browser/chromeos/policy/policy_cert_service_factory.h" 10 #include "chrome/browser/chromeos/policy/policy_cert_service_factory.h"
11 #include "chrome/browser/chromeos/policy/policy_cert_verifier.h" 11 #include "chrome/browser/chromeos/policy/policy_cert_verifier.h"
12 #include "components/user_manager/user_manager.h" 12 #include "components/user_manager/user_manager.h"
13 #include "content/public/browser/browser_thread.h" 13 #include "content/public/browser/browser_thread.h"
14 #include "net/cert/x509_certificate.h" 14 #include "net/cert/x509_certificate.h"
15 15
16 namespace policy { 16 namespace policy {
17 17
18 PolicyCertService::~PolicyCertService() { 18 PolicyCertService::~PolicyCertService() {
19 DCHECK(cert_verifier_) 19 DCHECK(cert_verifier_)
20 << "CreatePolicyCertVerifier() must be called after construction."; 20 << "CreatePolicyCertVerifier() must be called after construction.";
21 } 21 }
22 22
23 PolicyCertService::PolicyCertService( 23 PolicyCertService::PolicyCertService(
24 const std::string& user_id, 24 const user_manager::UserID& user_id,
25 UserNetworkConfigurationUpdater* net_conf_updater, 25 UserNetworkConfigurationUpdater* net_conf_updater,
26 user_manager::UserManager* user_manager) 26 user_manager::UserManager* user_manager)
27 : cert_verifier_(NULL), 27 : cert_verifier_(NULL),
28 user_id_(user_id), 28 user_id_(user_id),
29 net_conf_updater_(net_conf_updater), 29 net_conf_updater_(net_conf_updater),
30 user_manager_(user_manager), 30 user_manager_(user_manager),
31 has_trust_anchors_(false), 31 has_trust_anchors_(false),
32 weak_ptr_factory_(this) { 32 weak_ptr_factory_(this) {
33 DCHECK(net_conf_updater_); 33 DCHECK(net_conf_updater_);
34 DCHECK(user_manager_); 34 DCHECK(user_manager_);
35 } 35 }
36 36
37 PolicyCertService::PolicyCertService(const std::string& user_id, 37 PolicyCertService::PolicyCertService(const user_manager::UserID& user_id,
38 PolicyCertVerifier* verifier, 38 PolicyCertVerifier* verifier,
39 user_manager::UserManager* user_manager) 39 user_manager::UserManager* user_manager)
40 : cert_verifier_(verifier), 40 : cert_verifier_(verifier),
41 user_id_(user_id), 41 user_id_(user_id),
42 net_conf_updater_(NULL), 42 net_conf_updater_(NULL),
43 user_manager_(user_manager), 43 user_manager_(user_manager),
44 has_trust_anchors_(false), 44 has_trust_anchors_(false),
45 weak_ptr_factory_(this) { 45 weak_ptr_factory_(this) {
46 } 46 }
47 47
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 void PolicyCertService::Shutdown() { 101 void PolicyCertService::Shutdown() {
102 weak_ptr_factory_.InvalidateWeakPtrs(); 102 weak_ptr_factory_.InvalidateWeakPtrs();
103 if (net_conf_updater_) 103 if (net_conf_updater_)
104 net_conf_updater_->RemoveTrustedCertsObserver(this); 104 net_conf_updater_->RemoveTrustedCertsObserver(this);
105 OnTrustAnchorsChanged(net::CertificateList()); 105 OnTrustAnchorsChanged(net::CertificateList());
106 net_conf_updater_ = NULL; 106 net_conf_updater_ = NULL;
107 } 107 }
108 108
109 // static 109 // static
110 scoped_ptr<PolicyCertService> PolicyCertService::CreateForTesting( 110 scoped_ptr<PolicyCertService> PolicyCertService::CreateForTesting(
111 const std::string& user_id, 111 const user_manager::UserID& user_id,
112 PolicyCertVerifier* verifier, 112 PolicyCertVerifier* verifier,
113 user_manager::UserManager* user_manager) { 113 user_manager::UserManager* user_manager) {
114 return make_scoped_ptr( 114 return make_scoped_ptr(
115 new PolicyCertService(user_id, verifier, user_manager)); 115 new PolicyCertService(user_id, verifier, user_manager));
116 } 116 }
117 117
118 } // namespace policy 118 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698