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

chrome/browser/browser_process_impl.h

 // 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.
 
 // When each service is created, we set a flag indicating this. At this point,
 // the service initialization could fail or succeed. This allows us to remember
 // if we tried to create a service, and not try creating it over and over if
 // the creation failed.
 
 #ifndef CHROME_BROWSER_BROWSER_PROCESS_IMPL_H_
 #define CHROME_BROWSER_BROWSER_PROCESS_IMPL_H_
 #pragma once
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/debug/stack_trace.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/threading/non_thread_safe.h"
 #include "base/timer.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/prefs/pref_change_registrar.h"
 #include "chrome/browser/prefs/pref_member.h"
 #include "content/public/browser/notification_observer.h"
 
 class ChromeNetLog;
 class ChromeResourceDispatcherHostDelegate;
 class CommandLine;
+class ProcessSingleton;
 class RemoteDebuggingServer;
 class TabCloseableStateWatcher;
 
 namespace policy {
 class BrowserPolicyConnector;
 class PolicyService;
 };
 
 // Real implementation of BrowserProcess that creates and returns the services.
 class BrowserProcessImpl : public BrowserProcess,
                            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.
   void PreCreateThreads();
 
   // Called after the threads have been created but before the message loops
   // starts running. Allows the browser process to do any initialization that
   // requires all threads running.
   void PreMainMessageLoopRun();
 
@@ skipping 203 matching lines @@
 #else
   scoped_ptr<ComponentUpdateService> component_updater_;
 
   scoped_refptr<CRLSetFetcher> crl_set_fetcher_;
 #endif
 
   // TODO(eroman): Remove this when done debugging 113031. This tracks
   // 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);
 };
 
 #endif  // CHROME_BROWSER_BROWSER_PROCESS_IMPL_H_