Remove retail mode.

chrome/browser/chromeos/chrome_browser_main_chromeos.cc

Index: chrome/browser/chromeos/chrome_browser_main_chromeos.cc
diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
index 448c8c8d039573d1a70fcef3728002092d1dcf11..2f8986218c4884ee7ee241a5a23be0b4b9c49c63 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
@@ -39,11 +39,9 @@
 #include "chrome/browser/chromeos/events/event_rewriter_controller.h"
 #include "chrome/browser/chromeos/events/keyboard_driven_event_rewriter.h"
 #include "chrome/browser/chromeos/extensions/default_app_order.h"
-#include "chrome/browser/chromeos/extensions/extension_system_event_observer.h"
 #include "chrome/browser/chromeos/external_metrics.h"
 #include "chrome/browser/chromeos/input_method/input_method_configuration.h"
 #include "chrome/browser/chromeos/input_method/input_method_util.h"
-#include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h"
 #include "chrome/browser/chromeos/language_preferences.h"
 #include "chrome/browser/chromeos/login/helper.h"
 #include "chrome/browser/chromeos/login/lock/screen_locker.h"
@@ -118,7 +116,6 @@
 #include "components/user_manager/user_manager.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
-#include "content/public/browser/power_save_blocker.h"
 #include "content/public/common/main_function_params.h"
 #include "media/audio/sounds/sounds_manager.h"
 #include "net/base/network_change_notifier.h"
@@ -138,8 +135,6 @@
 #endif
 
 #if !defined(USE_ATHENA)
-#include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_idle_logout.h"
-#include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.h"
 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
 #endif
 
@@ -270,11 +265,6 @@ ChromeBrowserMainPartsChromeos::ChromeBrowserMainPartsChromeos(
 }
 
 ChromeBrowserMainPartsChromeos::~ChromeBrowserMainPartsChromeos() {
-#if !defined(USE_ATHENA)
-  if (KioskModeSettings::Get()->IsKioskModeEnabled())
-    ShutdownKioskModeScreensaver();
-#endif
-
   // To be precise, logout (browser shutdown) is not yet done, but the
   // remaining work is negligible, hence we say LogoutDone here.
   BootTimesLoader::Get()->AddLogoutTimeMarker("LogoutDone", false);
@@ -394,16 +384,7 @@ void ChromeBrowserMainPartsChromeos::PreProfileInit() {
 
   g_browser_process->platform_part()->InitializeChromeUserManager();
 
-#if defined(USE_ATHENA)
   ScreenLocker::InitClass();
-#else
-  // Initialize the screen locker now so that it can receive
-  // LOGIN_USER_CHANGED notification from UserManager.
-  if (KioskModeSettings::Get()->IsKioskModeEnabled())
-    KioskModeIdleLogout::Initialize();
-  else
-    ScreenLocker::InitClass();
-#endif
 
   // This forces the ProfileManager to be created and register for the
   // notification it needs to track the logged in user.
@@ -598,15 +579,6 @@ void ChromeBrowserMainPartsChromeos::PostProfileInit() {
   if (user_manager::UserManager::Get()->IsLoggedInAsGuest())
     SetGuestLocale(profile());
 
-  // These observers must be initialized after the profile because
-  // they use the profile to dispatch extension events.
-  extension_system_event_observer_.reset(new ExtensionSystemEventObserver());

[bartfab (slow), 2014/12/02 21:25:26]

Why are you removing the |extension_system_event_observer_|?

[rkc, 2014/12/04 19:50:06]

It doesn't seem to be used for anything else except the retail mode power save
blocker.

-  if (KioskModeSettings::Get()->IsKioskModeEnabled()) {
-    retail_mode_power_save_blocker_ = content::PowerSaveBlocker::Create(
-        content::PowerSaveBlocker::kPowerSaveBlockPreventDisplaySleep,
-        "Retail mode");
-  }
-
   peripheral_battery_observer_.reset(new PeripheralBatteryObserver());
 
   renderer_freezer_.reset(
@@ -727,19 +699,12 @@ void ChromeBrowserMainPartsChromeos::PostMainMessageLoopRun() {
 
   // We should remove observers attached to D-Bus clients before
   // DBusThreadManager is shut down.
-  extension_system_event_observer_.reset();
-  retail_mode_power_save_blocker_.reset();
   peripheral_battery_observer_.reset();
   power_prefs_.reset();
   renderer_freezer_.reset();
   light_bar_.reset();
   wake_on_wifi_manager_.reset();
 
-  // Let the ScreenLocker unregister itself from SessionManagerClient before
-  // DBusThreadManager is shut down.
-  if (!KioskModeSettings::Get()->IsKioskModeEnabled())
-    ScreenLocker::ShutDownClass();

[bartfab (slow), 2014/12/02 21:25:27]

Why is this no longer necessary?

[rkc, 2014/12/04 19:50:06]

Whoops, I missed the !
Done.

-
   keyboard_event_rewriters_.reset();
 #if defined(USE_X11)
   // The XInput2 event listener needs to be shut down earlier than when