OAuth2LoginManager+MergeSessionThrottle hardening, multi-profle support

chrome/browser/chromeos/login/user_manager.cc

 // 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.
 
 #include "chrome/browser/chromeos/login/user_manager.h"
 
 #include "base/logging.h"
 #include "chrome/browser/chromeos/login/user_manager_impl.h"
 
 namespace chromeos {
@@ skipping 13 matching lines @@
 // static
 const char UserManager::kRetailModeUserName[] = "demouser@";
 static UserManager* g_user_manager = NULL;
 
 UserManager::Observer::~Observer() {
 }
 
 void UserManager::Observer::LocalStateChanged(UserManager* user_manager) {
 }
 
-void UserManager::Observer::MergeSessionStateChanged(MergeSessionState state) {
-}
-
 void UserManager::UserSessionStateObserver::ActiveUserChanged(
     const User* active_user) {
 }
 
 void UserManager::UserSessionStateObserver::ActiveUserHashChanged(
     const std::string& hash) {
 }
 
 void UserManager::UserSessionStateObserver::
 PendingUserSessionsRestoreFinished() {
@@ skipping 48 matching lines @@
 ScopedTestUserManager::ScopedTestUserManager() {
   UserManager::Initialize();
 }
 
 ScopedTestUserManager::~ScopedTestUserManager() {
   UserManager::Get()->Shutdown();
   UserManager::Destroy();
 }
 
 }  // namespace chromeos