Move the window destruction and registration out of cleanup and into BrowserProcessImpl::EndSession…

chrome/browser/browser_process_impl.h

Index: chrome/browser/browser_process_impl.h
===================================================================
--- chrome/browser/browser_process_impl.h	(revision 141718)
+++ chrome/browser/browser_process_impl.h	(working copy)
@@ -27,6 +27,7 @@
 class ChromeNetLog;
 class ChromeResourceDispatcherHostDelegate;
 class CommandLine;
+class ProcessSingleton;
 class RemoteDebuggingServer;
 class TabCloseableStateWatcher;
 
@@ -40,7 +41,8 @@
                            public base::NonThreadSafe,
                            public content::NotificationObserver {
  public:
-  explicit BrowserProcessImpl(const CommandLine& command_line);
+  BrowserProcessImpl(const CommandLine& command_line,
+                     ProcessSingleton* process_singleton);
   virtual ~BrowserProcessImpl();
 
   // Called before the browser threads are created.
@@ -264,6 +266,10 @@
   // the callstack which released the final module reference count.
   base::debug::StackTrace release_last_reference_callstack_;
 
+  // A weak pointer to the process_singleton for use in cleanup during
+  // EndSession on Windows.
+  ProcessSingleton* process_singleton_;
+
   DISALLOW_COPY_AND_ASSIGN(BrowserProcessImpl);
 };