Relands "Removed InProcessBrowserTest::CleanUpOnMainThread()"

chrome/browser/sessions/session_restore_browsertest_chromeos.cc

 // Copyright (c) 2012 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 <list>
 #include <vector>
 
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
@@ skipping 16 matching lines @@
 
 class SessionRestoreTestChromeOS : public InProcessBrowserTest {
  public:
   virtual ~SessionRestoreTestChromeOS() {}
 
  protected:
   virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE {
     InProcessBrowserTest::SetUpCommandLine(command_line);
   }
 
-  virtual void SetUpOnMainThread() OVERRIDE {
-    InProcessBrowserTest::SetUpOnMainThread();
-  }
-
-  virtual void TearDownOnMainThread() OVERRIDE {
-    InProcessBrowserTest::TearDownOnMainThread();
-    for (std::list<Browser*>::iterator iter = browser_list_.begin();
-         iter != browser_list_.end(); ++iter) {
-      CloseBrowserSynchronously(*iter);
-    }
-    browser_list_.clear();
-  }

[stevenjb, 2014/07/25 16:52:48]

This lgtm. As mentioned in email, this was introduced ages ago to ensure a clean
shutdown. If it is no longer necessary and makes the tests happy, removing this
seems fine.

-
   Browser* CreateBrowserWithParams(Browser::CreateParams params) {
     Browser* browser = new Browser(params);
     AddBlankTabAndShow(browser);
     browser_list_.push_back(browser);
     return browser;
   }
 
   bool CloseBrowser(Browser* browser) {
     for (std::list<Browser*>::iterator iter = browser_list_.begin();
          iter != browser_list_.end(); ++iter) {
@@ skipping 114 matching lines @@
   size_t total_count = 0;
   size_t maximized_count = 0;
   for (chrome::BrowserIterator it; !it.done(); it.Next()) {
     ++total_count;
     if (it->window()->IsMaximized())
       ++maximized_count;
   }
   EXPECT_EQ(4u, total_count);
   EXPECT_EQ(2u, maximized_count);
 }