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

chrome/browser/browser_init.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/browser_init.h"
 
 #include <algorithm>   // For max().
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
@@ skipping 442 matching lines @@
 
     chromeos::CrosLibrary::Get()->GetNetworkLibrary()->AddObserver(
         chromeos::NetworkStateNotifier::Get());
 
     // Creates the SystemKeyEventListener to listen for keypress messages
     // regardless of what window has focus.
     chromeos::SystemKeyEventListener::instance();
   }
 #endif
 
-  if (command_line.HasSwitch(switches::kRestoreBackgroundContents)) {
+  if (command_line.HasSwitch(switches::kRestoreBackgroundContents) ||
+      command_line.HasSwitch(switches::kKeepAliveForTest)) {
     // Create status icons
     StatusTrayManager* tray = g_browser_process->status_tray_manager();
     if (tray)
       tray->Init(profile);
   }
   return true;
 }
 
 #if defined(OS_CHROMEOS)
 bool BrowserInit::ApplyServicesCustomization(
@@ skipping 597 matching lines @@
   scoped_refptr<AutomationProviderClass> automation =
       new AutomationProviderClass(profile);
   automation->ConnectToChannel(channel_id);
   automation->SetExpectedTabCount(expected_tabs);
 
   AutomationProviderList* list =
       g_browser_process->InitAutomationProviderList();
   DCHECK(list);
   list->AddProvider(automation);
 }