Refactor shutdown code to allow win/linux to run after last browser closes.

chrome/browser/tab_contents/background_contents.cc

 // Copyright (c) 2010 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/tab_contents/background_contents.h"
 
 #include "chrome/browser/background_contents_service.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browsing_instance.h"
@@ skipping 16 matching lines @@
                                        int routing_id) {
   Profile* profile = site_instance->browsing_instance()->profile();
 
   // TODO(rafaelw): Implement correct session storage.
   int64 session_storage_namespace_id = profile->GetWebKitContext()->
       dom_storage_context()->AllocateSessionStorageNamespaceId();
   render_view_host_ = new RenderViewHost(site_instance, this, routing_id,
                                          session_storage_namespace_id);
   render_view_host_->AllowScriptToClose(true);
 
+  // Close ourselves when the application is shutting down.
+  registrar_.Add(this, NotificationType::APP_TERMINATING,
+                 NotificationService::AllSources());
+
   // Register for our parent profile to shutdown, so we can shut ourselves down
-  // as well.
+  // as well (should only be called for OTR profiles, as we should receive
+  // APP_TERMINATING before non-OTR profiles are destroyed).
   registrar_.Add(this, NotificationType::PROFILE_DESTROYED,
                  Source<Profile>(profile));
 }
 
 // Exposed to allow creating mocks.
 BackgroundContents::BackgroundContents()
     : render_view_host_(NULL) {
 }
 
 void BackgroundContents::Observe(NotificationType type,
                                  const NotificationSource& source,
                                  const NotificationDetails& details) {
   // TODO(rafaelw): Implement pagegroup ref-counting so that non-persistent
   // background pages are closed when the last referencing frame is closed.
   switch (type.value) {
-    case NotificationType::PROFILE_DESTROYED: {
+    case NotificationType::PROFILE_DESTROYED:
+    case NotificationType::APP_TERMINATING: {
       delete this;
       break;
     }
     default:
       NOTREACHED() << "Unexpected notification sent.";
       break;
   }
 }
 
 BackgroundContents::~BackgroundContents() {
@@ skipping 124 matching lines @@
     return;
 
   browser->AddTabContents(contents, disposition, initial_pos, user_gesture);
 }
 
 void BackgroundContents::ShowCreatedWidget(int route_id,
                                            const gfx::Rect& initial_pos) {
   NOTIMPLEMENTED();
 }