SupervisedUsers : Fix transaction cleanup

chrome/browser/chromeos/login/user_manager_impl.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_USER_MANAGER_IMPL_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_USER_MANAGER_IMPL_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 167 matching lines @@
 
   // Returns the user with the given email address if found in the persistent
   // list or currently logged in as ephemeral. Returns |NULL| otherwise.
   // Same as FindUser but returns non-const pointer to User object.
   User* FindUserAndModify(const std::string& user_id);
 
   // Returns the user with the given email address if found in the persistent
   // 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);
 
   // Indicates that a user just logged in as guest.
   void GuestUserLoggedIn();
 
   // Indicates that a regular user just logged in.
   void RegularUserLoggedIn(const std::string& user_id);
 
   // Indicates that a regular user just logged in as ephemeral.
@@ skipping 111 matching lines @@
       const std::string& user_id,
       const string16& display_name,
       const std::string* resolved_account_locale);
 
   // Decorator to the previous function.
   void UpdateUserAccountDataImplCallbackDecorator(
       const scoped_ptr<UpdateUserAccountDataCallbackData>& data);
 
   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;
 
   // Interface to the signed settings store.
   CrosSettings* cros_settings_;
 
   // Interface to device-local account definitions and associated policy.
   policy::DeviceLocalAccountPolicyService* device_local_account_policy_service_;
 
   // True if users have been loaded from prefs already.
@@ skipping 103 matching lines @@
   scoped_ptr<MultiProfileUserController> multi_profile_user_controller_;
   scoped_ptr<MultiProfileFirstRunNotification>
       multi_profile_first_run_notification_;
 
   DISALLOW_COPY_AND_ASSIGN(UserManagerImpl);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_USER_MANAGER_IMPL_H_