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

chrome/browser/background_contents_service_unittest.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 "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/scoped_ptr.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/background_contents_service.h"
+#include "chrome/browser/browser_list.h"
 #include "chrome/browser/pref_service.h"
 #include "chrome/browser/tab_contents/background_contents.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/testing_browser_process.h"
 #include "chrome/test/testing_profile.h"
 #include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 
@@ skipping 84 matching lines @@
 
 TEST_F(BackgroundContentsServiceTest, Create) {
   // Check for creation and leaks.
   TestingProfile profile;
   BackgroundContentsService service(&profile, command_line_.get());
 }
 
 TEST_F(BackgroundContentsServiceTest, BackgroundContentsCreateDestroy) {
   TestingProfile profile;
   BackgroundContentsService service(&profile, command_line_.get());
-  // TODO(atwilson): Enable the refcount part of the test once we fix the
-  // APP_TERMINATING notification to be sent at the proper time.
-  // (http://crbug.com/45275).
-  //
-  //  TestingBrowserProcess* process =
-  //      static_cast<TestingBrowserProcess*>(g_browser_process);
-  // unsigned int starting_ref_count = process->module_ref_count();
   MockBackgroundContents* contents = new MockBackgroundContents(&profile);
   EXPECT_FALSE(service.IsTracked(contents));
+  EXPECT_FALSE(BrowserList::WillKeepAlive());
   contents->SendOpenedNotification();
-  // EXPECT_EQ(starting_ref_count+1, process->module_ref_count());
+  EXPECT_TRUE(BrowserList::WillKeepAlive());
   EXPECT_TRUE(service.IsTracked(contents));
   delete contents;
-  // EXPECT_EQ(starting_ref_count, process->module_ref_count());
+  EXPECT_FALSE(BrowserList::WillKeepAlive());
   EXPECT_FALSE(service.IsTracked(contents));
 }
 
 TEST_F(BackgroundContentsServiceTest, BackgroundContentsUrlAdded) {
   TestingProfile profile;
   GetPrefs(&profile)->Clear();
   BackgroundContentsService service(&profile, command_line_.get());
   GURL orig_url;
   GURL url("http://a/");
   GURL url2("http://a/");
@@ skipping 90 matching lines @@
   contents->Navigate(url);
   EXPECT_EQ(1U, GetPrefs(&profile)->size());
   contents2->Navigate(url2);
   EXPECT_EQ(2U, GetPrefs(&profile)->size());
   service.ShutdownAssociatedBackgroundContents(ASCIIToUTF16("appid"));
   EXPECT_FALSE(service.IsTracked(contents));
   EXPECT_EQ(NULL, service.GetAppBackgroundContents(ASCIIToUTF16("appid")));
   EXPECT_EQ(1U, GetPrefs(&profile)->size());
   EXPECT_EQ(url2.spec(), GetPrefURLForApp(&profile, contents2->appid()));
 }