Implemented consumer management unenrollment.

chrome/browser/chromeos/ownership/owner_settings_service_chromeos.cc

 // Copyright 2014 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/ownership/owner_settings_service_chromeos.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 314 matching lines @@
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   DCHECK(thread_checker_.CalledOnValidThread());
   if (type != chrome::NOTIFICATION_PROFILE_CREATED) {
     NOTREACHED();
     return;
   }
 
   Profile* profile = content::Source<Profile>(source).ptr();
   if (profile != profile_) {
+    LOG(ERROR) << "===== profile = " << profile;

[ygorshenin1, 2015/01/12 10:08:55]

Could you please replace these two error messages by something like:

LOG(ERROR) << "Profile mismatch: expected=" << profile_ << ", actual=" <<
profile;

?

[davidyu, 2015/01/13 05:43:52]

I'll just remove the debug message that I forgot to remove. Printing the pointer
address doesn't really help much.

+    LOG(ERROR) << "===== profile_ = " << profile_;
     NOTREACHED();
     return;
   }
 
   waiting_for_profile_creation_ = false;
   ReloadKeypair();
 }
 
 void OwnerSettingsServiceChromeOS::OwnerKeySet(bool success) {
   DCHECK(thread_checker_.CalledOnValidThread());
@@ skipping 367 matching lines @@
   for (const auto& change : pending_changes_)
     UpdateDeviceSettings(change.first, *change.second, settings);
   pending_changes_.clear();
 
   scoped_ptr<em::PolicyData> policy = AssemblePolicy(
       user_id_, device_settings_service_->policy_data(), &settings);
 
   if (has_pending_management_settings_) {
     policy::SetManagementMode(*policy,
                               pending_management_settings_.management_mode);
-    policy->set_request_token(pending_management_settings_.request_token);
-    policy->set_device_id(pending_management_settings_.device_id);
+
+    if (pending_management_settings_.request_token.empty())
+      policy->clear_request_token();
+    else
+      policy->set_request_token(pending_management_settings_.request_token);
+
+    if (pending_management_settings_.device_id.empty())
+      policy->clear_device_id();
+    else
+      policy->set_device_id(pending_management_settings_.device_id);
   }
   has_pending_management_settings_ = false;
 
   bool rv = AssembleAndSignPolicyAsync(
       content::BrowserThread::GetBlockingPool(), policy.Pass(),
       base::Bind(&OwnerSettingsServiceChromeOS::OnPolicyAssembledAndSigned,
                  store_settings_factory_.GetWeakPtr()));
   if (!rv)
     ReportStatusAndContinueStoring(false /* success */);
 }
@@ skipping 27 matching lines @@
   std::vector<OnManagementSettingsSetCallback> callbacks;
   pending_management_settings_callbacks_.swap(callbacks);
   for (const auto& callback : callbacks) {
     if (!callback.is_null())
       callback.Run(success);
   }
   StorePendingChanges();
 }
 
 }  // namespace chromeos