Revert of Multiprofile security: Show a warning messagebox when desktop casting/sharing is turned on upon user

chrome/browser/ui/ash/session_state_delegate_chromeos.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/ui/ash/session_state_delegate_chromeos.h"
 
 #include "ash/multi_profile_uma.h"
 #include "ash/session/session_state_observer.h"
-#include "ash/system/chromeos/multi_user/user_switch_util.h"
-#include "base/bind.h"
-#include "base/callback.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/chromeos/login/lock/screen_locker.h"
 #include "chrome/browser/chromeos/login/ui/user_adding_screen.h"
 #include "chrome/browser/chromeos/login/users/multi_profile_user_controller.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h"
@@ skipping 138 matching lines @@
 }
 
 void SessionStateDelegateChromeos::SwitchActiveUser(
     const std::string& user_id) {
   // Disallow switching to an already active user since that might crash.
   // Also check that we got a user id and not an email address.
   DCHECK_EQ(user_id,
             gaia::CanonicalizeEmail(gaia::SanitizeEmail(user_id)));
   if (user_id == user_manager::UserManager::Get()->GetActiveUser()->email())
     return;
-  TryToSwitchUser(user_id);
+  user_manager::UserManager::Get()->SwitchActiveUser(user_id);
 }
 
 void SessionStateDelegateChromeos::CycleActiveUser(CycleUser cycle_user) {
   // Make sure there is a user to switch to.
   if (NumberOfLoggedInUsers() <= 1)
     return;
 
   const user_manager::UserList& logged_in_users =
       user_manager::UserManager::Get()->GetLoggedInUsers();
 
@@ skipping 22 matching lines @@
         user_id = (*it)->email();
       break;
     case CYCLE_TO_PREVIOUS_USER:
       if (it == logged_in_users.begin())
         it = logged_in_users.end();
       user_id = (*(--it))->email();
       break;
   }
 
   // Switch using the transformed |user_id|.
-  TryToSwitchUser(user_id);
+  user_manager::UserManager::Get()->SwitchActiveUser(user_id);
 }
 
 bool SessionStateDelegateChromeos::IsMultiProfileAllowedByPrimaryUserPolicy()
     const {
   return chromeos::MultiProfileUserController::GetPrimaryUserPolicy() ==
          chromeos::MultiProfileUserController::ALLOWED;
 }
 
 void SessionStateDelegateChromeos::AddSessionStateObserver(
     ash::SessionStateObserver* observer) {
@@ skipping 39 matching lines @@
 
   session_state_ = new_state;
   NotifySessionStateChanged();
 }
 
 void SessionStateDelegateChromeos::NotifySessionStateChanged() {
   FOR_EACH_OBSERVER(ash::SessionStateObserver,
                     session_state_observer_list_,
                     SessionStateChanged(session_state_));
 }
-
-void DoSwitchUser(const std::string& user_id) {
-  user_manager::UserManager::Get()->SwitchActiveUser(user_id);
-}
-
-void SessionStateDelegateChromeos::TryToSwitchUser(
-    const std::string& user_id) {
-  ash::TrySwitchingActiveUser(base::Bind(&DoSwitchUser, user_id));
-}