SupervisedUsers : Fix transaction cleanup

chrome/browser/chromeos/login/user_manager_impl.h

Index: chrome/browser/chromeos/login/user_manager_impl.h
diff --git a/chrome/browser/chromeos/login/user_manager_impl.h b/chrome/browser/chromeos/login/user_manager_impl.h
index df38699fa77e073918b12660dc05292170173815..94a910a68b4b9132955eefb66282189b52767693 100644
--- a/chrome/browser/chromeos/login/user_manager_impl.h
+++ b/chrome/browser/chromeos/login/user_manager_impl.h
@@ -185,6 +185,10 @@ class UserManagerImpl
   // list. Returns |NULL| otherwise.
   const User* FindUserInList(const std::string& user_id) const;
 
+  // Returns |true| if user with the given id is found in the persistent list.
+  // Returns |false| otherwise. Does not trigger user loading.
+  const bool UserExistsInList(const std::string& user_id) const;
+
   // Same as FindUserInList but returns non-const pointer to User object.
   User* FindUserInListAndModify(const std::string& user_id);
 
@@ -316,6 +320,17 @@ class UserManagerImpl
 
   Profile* GetProfileByUser(const User* user) const;
 
+  // Implementation for RemoveUser method. This is an asynchronous part of the
+  // method, that verifies that owner will not get deleted, and calls
+  // |RemoveNonOwnerUserInternal|.
+  void RemoveUserInternal(const std::string& user_email,
+                          RemoveUserDelegate* delegate);
+
+  // Implementation for RemoveUser method. It is synchronous. It is called from
+  // RemoveUserInternal after owner check.
+  void RemoveNonOwnerUserInternal(const std::string& user_email,
+                                  RemoveUserDelegate* delegate);
+
   // MultiProfileUserControllerDelegate implementation:
   virtual void OnUserNotAllowed() OVERRIDE;