Fix crash during shutdown

chrome/browser/chromeos/chrome_browser_main_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/chromeos/chrome_browser_main_chromeos.h"
 
 #include <string>
 #include <vector>
 
 #include "ash/ash_switches.h"
@@ skipping 609 matching lines @@
 void ChromeBrowserMainPartsChromeos::PostBrowserStart() {
   // These are dependent on the ash::Shell singleton already having been
   // initialized.
 #if !defined(USE_ATHENA)
   // TODO(oshima): Remove ash dependency in PowerButtonObserver.
   // crbug.com/408832.
   power_button_observer_.reset(new PowerButtonObserver);
 #endif
   data_promo_notification_.reset(new DataPromoNotification());
 
+#if !defined(USE_ATHENA)
+  // TODO(oshima): Support accessibility on athena. crbug.com/408733.
   keyboard_event_rewriters_.reset(new EventRewriterController());
   keyboard_event_rewriters_->AddEventRewriter(
       scoped_ptr<ui::EventRewriter>(new KeyboardDrivenEventRewriter()));
-#if !defined(USE_ATHENA)
-  // TODO(oshima): Support accessibility on athena. crbug.com/408733.
   keyboard_event_rewriters_->AddEventRewriter(scoped_ptr<ui::EventRewriter>(
       new EventRewriter(ash::Shell::GetInstance()->sticky_keys_controller())));
   keyboard_event_rewriters_->Init();
 #endif
 
   ChromeBrowserMainPartsLinux::PostBrowserStart();
 }
 
 // Shut down services before the browser process, etc are destroyed.
 void ChromeBrowserMainPartsChromeos::PostMainMessageLoopRun() {
@@ skipping 53 matching lines @@
   SystemKeyEventListener::Shutdown();
 #endif
 
   imageburner::BurnManager::Shutdown();
   CrasAudioHandler::Shutdown();
 
   // Detach D-Bus clients before DBusThreadManager is shut down.
   power_button_observer_.reset();
   idle_action_warning_observer_.reset();
 
+#if !defined(USE_ATHENA)
   MagnificationManager::Shutdown();
+#endif
   AccessibilityManager::Shutdown();
 
   media::SoundsManager::Shutdown();
 
   system::StatisticsProvider::GetInstance()->Shutdown();
 
   // Let the UserManager and WallpaperManager unregister itself as an observer
   // of the CrosSettings singleton before it is destroyed. This also ensures
   // that the UserManager has no URLRequest pending (see
   // http://crbug.com/276659).
@@ skipping 37 matching lines @@
   // Destroy DBus services immediately after threads are stopped.
   dbus_services_.reset();
 
   ChromeBrowserMainPartsLinux::PostDestroyThreads();
 
   // Destroy DeviceSettingsService after g_browser_process.
   DeviceSettingsService::Shutdown();
 }
 
 }  //  namespace chromeos