Move token handle obtaining to UserSessionManager

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 705 matching lines @@
   idle_action_warning_observer_.reset();
 
   MagnificationManager::Shutdown();
 
   AccessibilityManager::Shutdown();
 
   media::SoundsManager::Shutdown();
 
   system::StatisticsProvider::GetInstance()->Shutdown();
 
+  // Make sure that there is no pending URLRequests.

[Nikita (slow), 2015/05/15 16:14:22]

Please move this to line 772.

+  UserSessionManager::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).
   g_browser_process->platform_part()->user_manager()->Shutdown();
   WallpaperManager::Shutdown();
 
   // Let the DeviceDisablingManager unregister itself as an observer of the
   // CrosSettings singleton before it is destroyed.
   g_browser_process->platform_part()->ShutdownDeviceDisablingManager();
@@ skipping 38 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