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

chrome/test/in_process_browser_test.h

 // 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.
 
 #ifndef CHROME_TEST_IN_PROCESS_BROWSER_TEST_H_
 #define CHROME_TEST_IN_PROCESS_BROWSER_TEST_H_
 
-#include "chrome/common/notification_registrar.h"
-#include "chrome/common/notification_observer.h"
 #include "net/url_request/url_request_unittest.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 class Browser;
 class Profile;
 namespace net {
 class RuleBasedHostMapper;
 }
 
 // Base class for tests wanting to bring up a browser in the unit test process.
@@ skipping 12 matching lines @@
 //
 // By default InProcessBrowserTest creates a single Browser (as returned from
 // the CreateBrowser method). You can obviously create more as needed.
 
 // Browsers created while InProcessBrowserTest is running are shown hidden. Use
 // the command line switch --show-windows to make them visible when debugging.
 //
 // InProcessBrowserTest disables the sandbox when running.
 //
 // See ui_test_utils for a handful of methods designed for use with this class.
-class InProcessBrowserTest : public testing::Test, public NotificationObserver {
+class InProcessBrowserTest : public testing::Test {
  public:
   InProcessBrowserTest();
 
   // We do this so we can be used in a Task.
   void AddRef() {}
   void Release() {}
 
   // Configures everything for an in process browser test, then invokes
   // BrowserMain. BrowserMain ends up invoking RunTestOnMainThreadLoop.
   virtual void SetUp();
 
   // Restores state configured in SetUp.
   virtual void TearDown();
 
-  // Used to track when the browser_ is destroyed. Resets the |browser_| field
-  // to NULL.
-  virtual void Observe(NotificationType type,
-                       const NotificationSource& source,
-                       const NotificationDetails& details);
-
  protected:
   // Returns the browser created by CreateBrowser.
   Browser* browser() const { return browser_; }
 
   // Override this rather than TestBody.
   virtual void RunTestOnMainThread() = 0;
 
   // Override this to add command line flags specific to your test.
   virtual void SetUpCommandLine(CommandLine* command_line) {}
 
@@ skipping 18 matching lines @@
   void EnableSingleProcess() { single_process_ = true; }
 
  private:
   // Invokes CreateBrowser to create a browser, then RunTestOnMainThread, and
   // destroys the browser.
   void RunTestOnMainThreadLoop();
 
   // Browser created from CreateBrowser.
   Browser* browser_;
 
-  // Used to track when the browser is deleted.
-  NotificationRegistrar registrar_;
-
   // HTTPServer, created when StartHTTPServer is invoked.
   scoped_refptr<HTTPTestServer> http_server_;
 
   // Whether this test requires the browser windows to be shown (interactive
   // tests for example need the windows shown).
   bool show_window_;
 
   // Whether the JavaScript can access the DOMAutomationController (a JS object
   // that can send messages back to the browser).
   bool dom_automation_enabled_;
@@ skipping 34 matching lines @@
         parent_class::TearDownTestCase, \
         new ::testing::internal::TestFactoryImpl<\
             GTEST_TEST_CLASS_NAME_(test_case_name, test_name)>);\
 void GTEST_TEST_CLASS_NAME_(test_case_name, test_name)::RunTestOnMainThread()
 
 #define IN_PROC_BROWSER_TEST_F(test_fixture, test_name)\
   IN_PROC_BROWSER_TEST_(test_fixture, test_name, test_fixture,\
                     ::testing::internal::GetTypeId<test_fixture>())
 
 #endif  // CHROME_TEST_IN_PROCESS_BROWSER_TEST_H_