Implemented consumer management unenrollment.

chrome/browser/chromeos/settings/device_settings_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 "chrome/browser/chromeos/settings/device_settings_service.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/stl_util.h"
@@ skipping 151 matching lines @@
 
   scoped_ptr<em::PolicyData> policy =
       OwnerSettingsServiceChromeOS::AssemblePolicy(
           GetUsername(), policy_data(), device_settings());
   if (!policy) {
     HandleError(DeviceSettingsService::STORE_POLICY_ERROR, callback);
     return;
   }
 
   policy->set_management_mode(management_mode);
-  policy->set_request_token(request_token);
-  policy->set_device_id(device_id);
+  if (request_token.empty())
+    policy->clear_request_token();
+  else
+    policy->set_request_token(request_token);
+  if (device_id.empty())

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

Nit: I think it would be more readable if you added a blank line above this.

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

Done.

+    policy->clear_device_id();
+  else
+    policy->set_device_id(device_id);
 
   EnqueueSignAndStore(policy.Pass(), callback);
 }
 
 void DeviceSettingsService::Store(scoped_ptr<em::PolicyFetchResponse> policy,
                                   const base::Closure& callback) {
   Enqueue(linked_ptr<SessionManagerOperation>(new StoreSettingsOperation(
       base::Bind(&DeviceSettingsService::HandleCompletedOperation,
                  weak_factory_.GetWeakPtr(),
                  callback),
@@ skipping 220 matching lines @@
   DeviceSettingsService::Initialize();
 }
 
 ScopedTestDeviceSettingsService::~ScopedTestDeviceSettingsService() {
   // Clean pending operations.
   DeviceSettingsService::Get()->UnsetSessionManager();
   DeviceSettingsService::Shutdown();
 }
 
 }  // namespace chromeos