Revert 129396 - Restart the Chrome session after a successful KIOSK enrollment.

chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen.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/enrollment/enterprise_enrollment_screen.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/cryptohome_library.h"
-#include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
-#include "chrome/browser/chromeos/dbus/session_manager_client.h"
 #include "chrome/browser/chromeos/login/authenticator.h"
 #include "chrome/browser/chromeos/login/screen_observer.h"
 #include "chrome/browser/policy/auto_enrollment_client.h"
 #include "chrome/browser/policy/browser_policy_connector.h"
 #include "chrome/browser/policy/cloud_policy_data_store.h"
 #include "chrome/browser/policy/enterprise_metrics.h"
 
 namespace chromeos {
 
 namespace {
@@ skipping 47 matching lines @@
 }
 
 void EnterpriseEnrollmentScreen::OnOAuthTokenAvailable(
     const std::string& user,
     const std::string& token) {
   user_ = Authenticator::Canonicalize(user);
   RegisterForDevicePolicy(token);
 }
 
 void EnterpriseEnrollmentScreen::OnConfirmationClosed(bool go_back_to_signin) {
-  // If the machine has been put in KIOSK mode we have to restart the session
-  // here to go in the proper KIOSK mode login screen.
-  if (g_browser_process->browser_policy_connector()->
-          GetDeviceCloudPolicyDataStore()->device_mode() ==
-      policy::DEVICE_MODE_KIOSK) {
-    DBusThreadManager::Get()->GetSessionManagerClient()->StopSession();
-    return;
-  }
-
   get_screen_observer()->OnExit(go_back_to_signin ?
       ScreenObserver::ENTERPRISE_ENROLLMENT_COMPLETED :
       ScreenObserver::ENTERPRISE_AUTO_MAGIC_ENROLLMENT_COMPLETED);
 }
 
 bool EnterpriseEnrollmentScreen::IsAutoEnrollment(std::string* user) {
   if (is_auto_enrollment_)
     *user = user_;
   return is_auto_enrollment_;
 }
@@ skipping 124 matching lines @@
     // and notify us of progress through CloudPolicySubsystem::Observer.
     connector->RegisterForDevicePolicy(user_, token, is_auto_enrollment_);
     return;
   }
   NOTREACHED();
   if (is_showing_)
     actor_->ShowFatalEnrollmentError();
 }
 
 }  // namespace chromeos