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

Unified Diff: chrome/browser/chromeos/policy/policy_cert_service.cc

Issue 444903002: [cros] user_manager component - move UserManagerBase and UserManager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 4 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/policy/policy_cert_service.cc
diff --git a/chrome/browser/chromeos/policy/policy_cert_service.cc b/chrome/browser/chromeos/policy/policy_cert_service.cc
index 53b61f93b4668e06a9bbd3751438de40d4e429be..ed503b5b4c39b1e76ea08d337b2885da292ff456 100644
--- a/chrome/browser/chromeos/policy/policy_cert_service.cc
+++ b/chrome/browser/chromeos/policy/policy_cert_service.cc
@@ -7,9 +7,9 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
#include "base/logging.h"
-#include "chrome/browser/chromeos/login/users/user_manager.h"
#include "chrome/browser/chromeos/policy/policy_cert_service_factory.h"
#include "chrome/browser/chromeos/policy/policy_cert_verifier.h"
+#include "components/user_manager/user_manager.h"
#include "content/public/browser/browser_thread.h"
#include "net/cert/x509_certificate.h"
@@ -23,7 +23,7 @@ PolicyCertService::~PolicyCertService() {
PolicyCertService::PolicyCertService(
const std::string& user_id,
UserNetworkConfigurationUpdater* net_conf_updater,
- chromeos::UserManager* user_manager)
+ user_manager::UserManager* user_manager)
: cert_verifier_(NULL),
user_id_(user_id),
net_conf_updater_(net_conf_updater),
@@ -36,13 +36,14 @@ PolicyCertService::PolicyCertService(
PolicyCertService::PolicyCertService(const std::string& user_id,
PolicyCertVerifier* verifier,
- chromeos::UserManager* user_manager)
+ user_manager::UserManager* user_manager)
: cert_verifier_(verifier),
user_id_(user_id),
net_conf_updater_(NULL),
user_manager_(user_manager),
has_trust_anchors_(false),
- weak_ptr_factory_(this) {}
+ weak_ptr_factory_(this) {
+}
scoped_ptr<PolicyCertVerifier> PolicyCertService::CreatePolicyCertVerifier() {
base::Closure callback = base::Bind(
@@ -109,7 +110,7 @@ void PolicyCertService::Shutdown() {
scoped_ptr<PolicyCertService> PolicyCertService::CreateForTesting(
const std::string& user_id,
PolicyCertVerifier* verifier,
- chromeos::UserManager* user_manager) {
+ user_manager::UserManager* user_manager) {
return make_scoped_ptr(
new PolicyCertService(user_id, verifier, user_manager));
}
« no previous file with comments | « chrome/browser/chromeos/policy/policy_cert_service.h ('k') | chrome/browser/chromeos/policy/policy_cert_service_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698