Implemented consumer management unenrollment.

components/policy/core/common/cloud/cloud_policy_service.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/policy/core/common/cloud/cloud_policy_service.h"
 
 #include "base/callback.h"
+#include "base/logging.h"
 #include "policy/proto/device_management_backend.pb.h"
 
 namespace em = enterprise_management;
 
 namespace policy {
 
 CloudPolicyService::CloudPolicyService(const PolicyNamespaceKey& policy_ns_key,
                                        CloudPolicyClient* client,
                                        CloudPolicyStore* store)
     : policy_ns_key_(policy_ns_key),
       client_(client),
       store_(store),
       refresh_state_(REFRESH_NONE),
+      unregister_state_(UNREGISTER_NONE),
       initialization_complete_(false) {
   client_->AddNamespaceToFetch(policy_ns_key_);
   client_->AddObserver(this);
   store_->AddObserver(this);
 
   // Make sure we initialize |client_| from the policy data that might be
   // already present in |store_|.
   OnStoreLoaded(store_);
 }
 
 CloudPolicyService::~CloudPolicyService() {
   client_->RemoveNamespaceToFetch(policy_ns_key_);
   client_->RemoveObserver(this);
   store_->RemoveObserver(this);
 }
 
 std::string CloudPolicyService::ManagedBy() const {
   const em::PolicyData* policy = store_->policy();
   if (policy) {
     std::string username = policy->username();
     std::size_t pos = username.find('@');
     if (pos != std::string::npos)
       return username.substr(pos + 1);
   }
   return std::string();
 }
 
 void CloudPolicyService::RefreshPolicy(const RefreshPolicyCallback& callback) {
-  // If the client is not registered, bail out.
-  if (!client_->is_registered()) {
+  // If the client is not registered or is unregistering, bail out.
+  if (!client_->is_registered() || unregister_state_ != UNREGISTER_NONE) {
     callback.Run(false);
     return;
   }
 
   // Else, trigger a refresh.
   refresh_callbacks_.push_back(callback);
   refresh_state_ = REFRESH_POLICY_FETCH;
   client_->FetchPolicy();
 }
 
+void CloudPolicyService::Unregister(const UnregisterCallback& callback) {
+  // Abort all pending refresh requests.
+  if (refresh_state_ != REFRESH_NONE) {
+    RefreshCompleted(false);
+  }
+
+  unregister_callback_ = callback;

[bartfab (slow), 2014/11/28 13:25:18]

What if there already is an unregistration in progress? How about calling
unregister_callback_.Run(false); before overwriting it with the new callback?

[davidyu, 2014/12/01 17:05:23]

Done.

+  unregister_state_ = UNREGISTER_PENDING;
+  client_->Unregister();
+}
+
 void CloudPolicyService::OnPolicyFetched(CloudPolicyClient* client) {
   if (client_->status() != DM_STATUS_SUCCESS) {
     RefreshCompleted(false);
     return;
   }
 
   const em::PolicyFetchResponse* policy = client_->GetPolicyFor(policy_ns_key_);
   if (policy) {
     if (refresh_state_ != REFRESH_NONE)
       refresh_state_ = REFRESH_POLICY_STORE;
     store_->Store(*policy, client->fetched_invalidation_version());
   } else {
     RefreshCompleted(false);
   }
 }
 
 void CloudPolicyService::OnRegistrationStateChanged(CloudPolicyClient* client) {
+  if (unregister_state_ == UNREGISTER_PENDING)
+    UnregisterCompleted(true);
 }
 
 void CloudPolicyService::OnClientError(CloudPolicyClient* client) {
   if (refresh_state_ == REFRESH_POLICY_FETCH)
     RefreshCompleted(false);
+  if (unregister_state_ == UNREGISTER_PENDING)
+    UnregisterCompleted(false);
 }
 
 void CloudPolicyService::OnStoreLoaded(CloudPolicyStore* store) {
   // Update the client with state from the store.
   const em::PolicyData* policy(store_->policy());
 
   // Timestamp.
   base::Time policy_timestamp;
   if (policy && policy->has_timestamp()) {
     policy_timestamp =
@@ skipping 49 matching lines @@
   callbacks.swap(refresh_callbacks_);
   refresh_state_ = REFRESH_NONE;
 
   for (std::vector<RefreshPolicyCallback>::iterator callback(callbacks.begin());
        callback != callbacks.end();
        ++callback) {
     callback->Run(success);
   }
 }
 
+void CloudPolicyService::UnregisterCompleted(bool success) {
+  if (!success)
+    LOG(ERROR) << "Unregister request failed.";
+
+  unregister_state_ = UNREGISTER_NONE;
+  unregister_callback_.Run(success);

[bartfab (slow), 2014/11/28 13:25:18]

Nit: Reset the callback after running it. This will ensure that if someone binds
a refcounted object to the callback, the reference is dropped.

[davidyu, 2014/12/01 17:05:23]

Done.

+}
+
 void CloudPolicyService::AddObserver(Observer* observer) {
   observers_.AddObserver(observer);
 }
 
 void CloudPolicyService::RemoveObserver(Observer* observer) {
   observers_.RemoveObserver(observer);
 }
 
 }  // namespace policy