OAuth2LoginManager+MergeSessionThrottle hardening, multi-profle support

chrome/browser/chromeos/login/user_manager_impl.cc

 // Copyright (c) 2013 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.
 
 #include "chrome/browser/chromeos/login/user_manager_impl.h"
 
 #include <cstddef>
 #include <set>
 
 #include "base/bind.h"
@@ skipping 206 matching lines @@
     : cros_settings_(CrosSettings::Get()),
       device_local_account_policy_service_(NULL),
       users_loaded_(false),
       active_user_(NULL),
       session_started_(false),
       user_sessions_restored_(false),
       is_current_user_owner_(false),
       is_current_user_new_(false),
       is_current_user_ephemeral_regular_user_(false),
       ephemeral_users_enabled_(false),
-      merge_session_state_(MERGE_STATUS_NOT_STARTED),
+      merge_session_state_(MERGE_STATUS_UNINITILIZED),
       observed_sync_service_(NULL),
       user_image_manager_(new UserImageManagerImpl),
       manager_creation_time_(base::TimeTicks::Now()) {
   // UserManager instance should be used only on UI thread.
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   registrar_.Add(this, chrome::NOTIFICATION_OWNERSHIP_STATUS_CHANGED,
       content::NotificationService::AllSources());
   registrar_.Add(this, chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED,
       content::NotificationService::AllSources());
   RetrieveTrustedDevicePolicies();
@@ skipping 177 matching lines @@
 
 void UserManagerImpl::RestoreActiveSessions() {
   DBusThreadManager::Get()->GetSessionManagerClient()->RetrieveActiveSessions(
       base::Bind(&UserManagerImpl::OnRestoreActiveSessions,
                  base::Unretained(this)));
 }
 
 void UserManagerImpl::SessionStarted() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   session_started_ = true;
+  session_start_time_ = base::Time::Now();
   UpdateLoginState();
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_SESSION_STARTED,
       content::Source<UserManager>(this),
       content::Details<const User>(active_user_));
   if (is_current_user_new_) {
     // Make sure that the new user's data is persisted to Local State.
     g_browser_process->local_state()->CommitPendingWrite();
   }
 }
@@ skipping 462 matching lines @@
 bool UserManagerImpl::IsLoggedInAsStub() const {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   return IsUserLoggedIn() && active_user_->email() == kStubUser;
 }
 
 bool UserManagerImpl::IsSessionStarted() const {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   return session_started_;
 }
 
+int64 UserManagerImpl::GetSessionDurationInSeconds() const {
+  if (!session_started_)
+    return -1;
+
+  return (base::Time::Now() - session_start_time_).InSeconds();
+}
+
 bool UserManagerImpl::UserSessionsRestored() const {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   return user_sessions_restored_;
 }
 
 UserManager::MergeSessionState UserManagerImpl::GetMergeSessionState() const {
   return merge_session_state_;
 }
 
 void UserManagerImpl::SetMergeSessionState(
@@ skipping 902 matching lines @@
         base::TimeTicks::Now() - manager_creation_time_;
     if (!last_email.empty() && email != last_email &&
         time_to_login.InSeconds() <= kLogoutToLoginDelayMaxSec) {
       UMA_HISTOGRAM_CUSTOM_COUNTS("UserManager.LogoutToLoginDelay",
           time_to_login.InSeconds(), 0, kLogoutToLoginDelayMaxSec, 50);
     }
   }
 }
 
 }  // namespace chromeos