SupervisedUsers : Fix transaction cleanup

chrome/browser/chromeos/login/supervised_user_manager_impl.cc

 // Copyright 2013 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/login/supervised_user_manager_impl.h"
 
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/pref_service.h"
 #include "base/prefs/scoped_user_pref_update.h"
 #include "base/strings/string_util.h"
@@ skipping 245 matching lines @@
       GetString(kLocallyManagedUserCreationTransactionDisplayName);
   std::string user_id = prefs->
       GetString(kLocallyManagedUserCreationTransactionUserId);
 
   LOG(WARNING) << "Cleaning up transaction for "
                << display_name << "/" << user_id;
 
   if (user_id.empty()) {
     // Not much to do - just remove transaction.
     prefs->ClearPref(kLocallyManagedUserCreationTransactionDisplayName);
+    prefs->CommitPendingWrite();
     return;
   }
 
   if (gaia::ExtractDomainName(user_id) !=
           UserManager::kLocallyManagedUserDomain) {
     LOG(WARNING) << "Clean up transaction for  non-locally managed user found :"
                  << user_id << ", will not remove data";
     prefs->ClearPref(kLocallyManagedUserCreationTransactionDisplayName);
     prefs->ClearPref(kLocallyManagedUserCreationTransactionUserId);
+    prefs->CommitPendingWrite();
     return;
   }
-
-  owner_->RemoveUser(user_id, NULL);
+  owner_->RemoveNonOwnerUserInternal(user_id, NULL);
 
   prefs->ClearPref(kLocallyManagedUserCreationTransactionDisplayName);
   prefs->ClearPref(kLocallyManagedUserCreationTransactionUserId);
   prefs->CommitPendingWrite();
 }
 
 void SupervisedUserManagerImpl::RemoveNonCryptohomeData(
     const std::string& user_id) {
   PrefService* prefs = g_browser_process->local_state();
   ListPrefUpdate prefs_new_users_update(prefs, kLocallyManagedUsersFirstRun);
   prefs_new_users_update->Remove(base::StringValue(user_id), NULL);
 
+  DictionaryPrefUpdate synd_id_update(prefs, kManagedUserSyncId);
+  synd_id_update->RemoveWithoutPathExpansion(user_id, NULL);
+
   DictionaryPrefUpdate managers_update(prefs, kManagedUserManagers);
   managers_update->RemoveWithoutPathExpansion(user_id, NULL);
 
   DictionaryPrefUpdate manager_names_update(prefs,
                                             kManagedUserManagerNames);
   manager_names_update->RemoveWithoutPathExpansion(user_id, NULL);
 
   DictionaryPrefUpdate manager_emails_update(prefs,
                                              kManagedUserManagerDisplayEmails);
   manager_emails_update->RemoveWithoutPathExpansion(user_id, NULL);
@@ skipping 22 matching lines @@
     if (user_id == manager_id) {
       manager_name_update->SetWithoutPathExpansion(
           it.key(),
           new base::StringValue(new_display_name));
     }
   }
 }
 
 
 }  // namespace chromeos