Merge 225400 "Add "kiosk_only" manifest attribute for platform a..."

chrome/browser/chromeos/login/fake_user_manager.h

Index: chrome/browser/chromeos/login/fake_user_manager.h
===================================================================
--- chrome/browser/chromeos/login/fake_user_manager.h	(revision 227631)
+++ chrome/browser/chromeos/login/fake_user_manager.h	(working copy)
@@ -24,9 +24,12 @@
   // Create and add a new user.
   void AddUser(const std::string& email);
 
-  // Calculates the user name hash and calls UserLoggedIn to login a user.
-  void LoginUser(const std::string& email);
+  // Create and add a kiosk app user.
+  void AddKioskAppUser(const std::string& kiosk_app_username);
 
+   // Calculates the user name hash and calls UserLoggedIn to login a user.
+   void LoginUser(const std::string& email);
+
   // UserManager overrides.
   virtual const UserList& GetUsers() const OVERRIDE;
   virtual UserList GetUsersAdmittedForMultiProfile() const OVERRIDE;
@@ -134,6 +137,9 @@
   }
 
  private:
+  // We use this internal function for const-correctness.
+  User* GetActiveUserInternal() const;
+
   UserList user_list_;
   UserList logged_in_users_;
   std::string owner_email_;