Address races in UserImageManagerImpl

chrome/browser/chromeos/login/user_manager.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_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_USER_MANAGER_H_
 
 #include <string>
 
 #include "chrome/browser/chromeos/base/locale_util.h"
@@ skipping 156 matching lines @@
   virtual void RemoveUserFromList(const std::string& user_id) = 0;
 
   // Returns true if a user with the given user id is found in the persistent
   // list or currently logged in as ephemeral.
   virtual bool IsKnownUser(const std::string& user_id) const = 0;
 
   // Returns the user with the given user id if found in the persistent
   // list or currently logged in as ephemeral. Returns |NULL| otherwise.
   virtual const User* FindUser(const std::string& user_id) const = 0;
 
+  // Returns the user with the given user id 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.
+  virtual User* FindUserAndModify(const std::string& user_id) = 0;
+
   // Returns the logged-in user.
   // TODO(nkostylev): Deprecate this call, move clients to GetActiveUser().
   // http://crbug.com/230852
   virtual const User* GetLoggedInUser() const = 0;
   virtual User* GetLoggedInUser() = 0;
 
   // Returns the logged-in user that is currently active within this session.
   // There could be multiple users logged in at the the same but for now
   // we support only one of them being active.
   virtual const User* GetActiveUser() const = 0;
@@ skipping 177 matching lines @@
   ScopedTestUserManager();
   ~ScopedTestUserManager();
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ScopedTestUserManager);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_USER_MANAGER_H_