OAuth2LoginManager+MergeSessionThrottle hardening, multi-profle support

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 89 matching lines @@
   virtual bool IsUserLoggedIn() const OVERRIDE;
   virtual bool IsLoggedInAsRegularUser() const OVERRIDE;
   virtual bool IsLoggedInAsDemoUser() const OVERRIDE;
   virtual bool IsLoggedInAsPublicAccount() const OVERRIDE;
   virtual bool IsLoggedInAsGuest() const OVERRIDE;
   virtual bool IsLoggedInAsLocallyManagedUser() const OVERRIDE;
   virtual bool IsLoggedInAsKioskApp() const OVERRIDE;
   virtual bool IsLoggedInAsStub() const OVERRIDE;
   virtual bool IsSessionStarted() const OVERRIDE;
   virtual bool UserSessionsRestored() const OVERRIDE;
-  virtual MergeSessionState GetMergeSessionState() const OVERRIDE;
-  virtual void SetMergeSessionState(MergeSessionState status) OVERRIDE;
   virtual bool HasBrowserRestarted() const OVERRIDE;
   virtual bool IsUserNonCryptohomeDataEphemeral(
       const std::string& email) const OVERRIDE;
   virtual void AddObserver(UserManager::Observer* obs) OVERRIDE;
   virtual void RemoveObserver(UserManager::Observer* obs) OVERRIDE;
   virtual void AddSessionStateObserver(
       UserManager::UserSessionStateObserver* obs) OVERRIDE;
   virtual void RemoveSessionStateObserver(
       UserManager::UserSessionStateObserver* obs) OVERRIDE;
   virtual void NotifyLocalStateChanged() OVERRIDE;
@@ skipping 236 matching lines @@
   // such users by not adding them to the persistent user list, not downloading
   // their custom avatars and mounting their cryptohomes using tmpfs. Defaults
   // to |false|.
   bool is_current_user_ephemeral_regular_user_;
 
   // Cached flag indicating whether the ephemeral user policy is enabled.
   // Defaults to |false| if the value has not been read from trusted device
   // policy yet.
   bool ephemeral_users_enabled_;
 
-  // Merge session state (cookie restore process state).
-  MergeSessionState merge_session_state_;
-
   // Cached name of device owner. Defaults to empty string if the value has not
   // been read from trusted device policy yet.
   std::string owner_email_;
 
   // Chrome oauth client id and secret - override values for kiosk mode.
   std::string chrome_client_id_;
   std::string chrome_client_secret_;
 
   content::NotificationRegistrar registrar_;
 
@@ skipping 29 matching lines @@
 
   // Time at which this object was created.
   base::TimeTicks manager_creation_time_;
 
   DISALLOW_COPY_AND_ASSIGN(UserManagerImpl);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_USER_MANAGER_IMPL_H_