Close all browsers during InProcessBrowserTest cleanup, not just the main one...

chrome/test/in_process_browser_test.cc

 // Copyright (c) 2006-2008 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/test/in_process_browser_test.h"
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "chrome/browser/browser.h"
+#include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_shutdown.h"
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/profile_manager.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #if defined(OS_WIN)
 #include "chrome/browser/views/frame/browser_view.h"
 #endif
@@ skipping 114 matching lines @@
   browser_shutdown::delete_resources_on_shutdown = true;
 
 #if defined(WIN)
   BrowserView::SetShowState(-1);
 #endif
 
   *CommandLine::ForCurrentProcessMutable() = *original_command_line_;
   RenderProcessHost::set_run_renderer_in_process(original_single_process_);
 }
 
-void InProcessBrowserTest::Observe(NotificationType type,
-                                   const NotificationSource& source,
-                                   const NotificationDetails& details) {
-  if (type == NotificationType::BROWSER_CLOSED) {
-    DCHECK(Source<Browser>(source).ptr() == browser_);
-    browser_ = NULL;
-  } else {
-    NOTREACHED();
-  }
-}
-
 HTTPTestServer* InProcessBrowserTest::StartHTTPServer() {
   // The HTTPServer must run on the IO thread.
   DCHECK(!http_server_.get());
   http_server_ = HTTPTestServer::CreateServer(
       L"chrome/test/data",
       g_browser_process->io_thread()->message_loop());
   return http_server_.get();
 }
 
 // Creates a browser with a single tab (about:blank), waits for the tab to
@@ skipping 25 matching lines @@
   if (!profile) {
     // We should only be able to get here if the profile already exists and
     // has been created.
     NOTREACHED();
     MessageLoopForUI::current()->Quit();
     return;
   }
 
   browser_ = CreateBrowser(profile);
 
-  registrar_.Add(this,
-                 NotificationType::BROWSER_CLOSED,
-                 Source<Browser>(browser_));
-
   RunTestOnMainThread();
 
-  if (browser_)
-    browser_->CloseAllTabs();
-
-  // Remove all registered notifications, otherwise by the time the
-  // destructor is run the NotificationService is dead.
-  registrar_.RemoveAll();
+  BrowserList::const_reverse_iterator browser =
+      BrowserList::begin_last_active();
+  for (; browser != BrowserList::end_last_active(); ++browser) {

[sky, 2009/06/16 00:04:48]

nit: no {}

+    (*browser)->CloseAllTabs();
+  }
 
   // Stop the HTTP server.
   http_server_ = NULL;
 
   MessageLoopForUI::current()->Quit();
 }
 
 void InProcessBrowserTest::ConfigureHostMapper(
     net::RuleBasedHostMapper* host_mapper) {
   host_mapper->AllowDirectLookup("*.google.com");
   // See http://en.wikipedia.org/wiki/Web_Proxy_Autodiscovery_Protocol
   // We don't want the test code to use it.
   host_mapper->AddSimulatedFailure("wpad");
 }