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..1ba7ecad9c77acfa88199274e0a440a92dce46b2 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.

[Nikita (slow), 2013/11/13 01:37:19]

nit: drop double space.

[Denis Kuznetsov (DE-MUC), 2013/11/14 01:18:17]

Done.

[Nikita (slow), 2013/11/14 01:19:12]

Still an issue.

+  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,15 @@ 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.
+  void RemoveUserInternal(const std::string& user_email,
+                          RemoveUserDelegate* delegate);
+  // Implementation for RemoveUser method. This is a synchronous part of the

[Nikita (slow), 2013/11/13 01:27:54]

nit: empty line

[Denis Kuznetsov (DE-MUC), 2013/11/14 01:18:17]

Done.

+  // method.

[Nikita (slow), 2013/11/13 01:50:39]

Please expand comment and add how this is different from previous one.

[Nikita (slow), 2013/11/14 01:19:12]

Please update comment.

+  void RemoveNonOwnerUserInternal(const std::string& user_email,

[Nikita (slow), 2013/11/13 01:37:19]

I think you should fix code that calls RemoveUserInternal instead and there
should be no need to split this into two methods because now we have a way to
call RemoveNonOwnerUserInternal() with owner user_id and user will be
successfully deleted. This should never happen.

[Nikita (slow), 2013/11/13 01:50:39]

As discussed offline, my comments regarding moving this to public API should be
ignored since this one is still part of private API.

[Denis Kuznetsov (DE-MUC), 2013/11/14 01:18:17]

Done.

+                                  RemoveUserDelegate* delegate);
+
   // MultiProfileUserControllerDelegate implementation:
   virtual void OnUserNotAllowed() OVERRIDE;