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

Unified Diff: chrome/browser/policy/cloud_policy_client.cc

Issue 10693022: Add support for loading user cloud policy on desktop. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: removed redundant #ifdef OS_CHROMEOS guard Created 8 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/policy/cloud_policy_client.cc
diff --git a/chrome/browser/policy/cloud_policy_client.cc b/chrome/browser/policy/cloud_policy_client.cc
index c34adac9e14389b231fb28495679bd8133379ed2..6a27d06f0d4bbb3f545641f403607d88867afd48 100644
--- a/chrome/browser/policy/cloud_policy_client.cc
+++ b/chrome/browser/policy/cloud_policy_client.cc
@@ -31,9 +31,10 @@ CloudPolicyClient::CloudPolicyClient(const std::string& machine_id,
submit_machine_id_(false),
public_key_version_(-1),
public_key_version_valid_(false),
- service_(service),
- status_provider_(status_provider),
- status_(DM_STATUS_SUCCESS) {}
+ service_(service), // Can be NULL for unit tests.
+ status_provider_(status_provider), // Can be NULL for unit tests.
+ status_(DM_STATUS_SUCCESS) {
+}
CloudPolicyClient::~CloudPolicyClient() {}
@@ -52,6 +53,7 @@ void CloudPolicyClient::SetupRegistration(const std::string& dm_token,
}
void CloudPolicyClient::Register(const std::string& auth_token) {
+ DCHECK(service_);
DCHECK(!auth_token.empty());
DCHECK(!is_registered());
@@ -120,6 +122,7 @@ void CloudPolicyClient::FetchPolicy() {
}
void CloudPolicyClient::Unregister() {
+ DCHECK(service_);
request_job_.reset(
service_->CreateJob(DeviceManagementRequestJob::TYPE_UNREGISTRATION));
request_job_->SetDMToken(dm_token_);

Powered by Google App Engine
This is Rietveld 408576698