CrOS multi-profiles ProfileManager changes

chrome/browser/chromeos/login/mock_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_MOCK_USER_MANAGER_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_MOCK_USER_MANAGER_H_
 
 #include <string>
 
 #include "base/files/file_path.h"
@@ skipping 84 matching lines @@
   virtual User* GetLoggedInUser() OVERRIDE;
   virtual const User* GetActiveUser() const OVERRIDE;
   virtual User* GetActiveUser() OVERRIDE;
 
   virtual UserImageManager* GetUserImageManager() OVERRIDE;
 
   virtual UserFlow* GetCurrentUserFlow() const OVERRIDE;
   virtual UserFlow* GetUserFlow(const std::string&) const OVERRIDE;
 
   // Sets a new User instance.
-  void SetLoggedInUser(const std::string& email);
+  void SetActiveUser(const std::string& email);
 
   // Creates a new public session user.
   User* CreatePublicAccountUser(const std::string& email);
 
   User* user_;
   scoped_ptr<MockUserImageManager> user_image_manager_;
   scoped_ptr<UserFlow> user_flow_;
 };
 
 // Class that provides easy life-cycle management for mocking the UserManager
 // for tests.
 class ScopedMockUserManagerEnabler {
  public:
   ScopedMockUserManagerEnabler();
   ~ScopedMockUserManagerEnabler();
 
   MockUserManager* user_manager();
 
  private:
   UserManager* old_user_manager_;
   scoped_ptr<MockUserManager> user_manager_;
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_MOCK_USER_MANAGER_H_