mac: Fix five browser_tests on Yosemite.

chrome/browser/ui/startup/startup_browser_creator_browsertest.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 <algorithm>
 #include <string>
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/prefs/pref_service.h"
@@ skipping 50 matching lines @@
 using testing::_;
 using testing::Return;
 #endif  // defined(ENABLE_CONFIGURATION_POLICY) && !defined(OS_CHROMEOS)
 
 #if defined(ENABLE_SUPERVISED_USERS)
 #include "chrome/browser/supervised_user/supervised_user_navigation_observer.h"
 #include "chrome/browser/supervised_user/supervised_user_service.h"
 #include "chrome/browser/supervised_user/supervised_user_service_factory.h"
 #endif
 
+#if defined(OS_MACOSX) && !defined(OS_IOS)
+#include "base/mac/scoped_nsautorelease_pool.h"
+#endif  // defined(OS_MACOSX) && !defined(OS_IOS)
+
 using extensions::Extension;
 
 namespace {
 
 // Check that there are two browsers. Find the one that is not |browser|.
 Browser* FindOneOtherBrowser(Browser* browser) {
   // There should only be one other browser.
   EXPECT_EQ(2u, chrome::GetBrowserCount(browser->profile(),
                                         browser->host_desktop_type()));
 
   // Find the new browser.
   Browser* other_browser = NULL;
   for (chrome::BrowserIterator it; !it.done() && !other_browser; it.Next()) {
     if (*it != browser)
       other_browser = *it;
   }
   return other_browser;
 }
 
 }  // namespace
 
 class StartupBrowserCreatorTest : public ExtensionBrowserTest {
  protected:
   StartupBrowserCreatorTest() {}
 
   bool SetUpUserDataDirectory() override {
     return ExtensionBrowserTest::SetUpUserDataDirectory();
   }
 
+  void CloseBrowser(Browser* browser) {
+    browser->window()->Close();
+#if defined(OS_MACOSX) && !defined(OS_IOS)
+    AutoreleasePool()->Recycle();
+#endif  // defined(OS_MACOSX) && !defined(OS_IOS)
+  }
+
   void SetUpCommandLine(base::CommandLine* command_line) override {
     ExtensionBrowserTest::SetUpCommandLine(command_line);
     command_line->AppendSwitch(switches::kEnablePanels);
     command_line->AppendSwitchASCII(switches::kHomePage, url::kAboutBlankURL);
 #if defined(OS_CHROMEOS)
     // TODO(nkostylev): Investigate if we can remove this switch.
     command_line->AppendSwitch(switches::kCreateBrowserOnStartupForTests);
 #endif
   }
 
@@ skipping 100 matching lines @@
   std::vector<GURL> urls;
   urls.push_back(test_server()->GetURL("files/title1.html"));
   urls.push_back(test_server()->GetURL("files/title2.html"));
 
   // Set the startup preference to open these URLs.
   SessionStartupPref pref(SessionStartupPref::URLS);
   pref.urls = urls;
   SessionStartupPref::SetStartupPref(browser()->profile(), pref);
 
   // Close the browser.
-  browser()->window()->Close();
+  CloseBrowser(browser());
 
   // Do a simple non-process-startup browser launch.
   base::CommandLine dummy(base::CommandLine::NO_PROGRAM);
   chrome::startup::IsFirstRun first_run = first_run::IsChromeFirstRun() ?
       chrome::startup::IS_FIRST_RUN : chrome::startup::IS_NOT_FIRST_RUN;
   StartupBrowserCreatorImpl launch(base::FilePath(), dummy, first_run);
   ASSERT_TRUE(launch.Launch(browser()->profile(), std::vector<GURL>(), false,
                             browser()->host_desktop_type()));
 
   // This should have created a new browser window.  |browser()| is still
@@ skipping 394 matching lines @@
 
   // Set different startup preferences for the 2 profiles.
   SessionStartupPref pref1(SessionStartupPref::URLS);
   pref1.urls = urls1;
   SessionStartupPref::SetStartupPref(default_profile, pref1);
   SessionStartupPref pref2(SessionStartupPref::URLS);
   pref2.urls = urls2;
   SessionStartupPref::SetStartupPref(other_profile, pref2);
 
   // Close the browser.
-  browser()->window()->Close();
+  CloseBrowser(browser());
 
   // Do a simple non-process-startup browser launch.
   base::CommandLine dummy(base::CommandLine::NO_PROGRAM);
 
   StartupBrowserCreator browser_creator;
   std::vector<Profile*> last_opened_profiles;
   last_opened_profiles.push_back(default_profile);
   last_opened_profiles.push_back(other_profile);
   browser_creator.Start(dummy, profile_manager->user_data_dir(),
                         default_profile, last_opened_profiles);
@@ skipping 37 matching lines @@
       dest_path.Append(FILE_PATH_LITERAL("New Profile 2")));
   ASSERT_TRUE(profile2);
 
   // Open some urls with the browsers, and close them.
   Browser* browser1 = new Browser(
       Browser::CreateParams(Browser::TYPE_TABBED, profile1,
                             browser()->host_desktop_type()));
   chrome::NewTab(browser1);
   ui_test_utils::NavigateToURL(browser1,
                                test_server()->GetURL("files/empty.html"));
-  browser1->window()->Close();
+  CloseBrowser(browser1);
 
   Browser* browser2 = new Browser(
       Browser::CreateParams(Browser::TYPE_TABBED, profile2,
                             browser()->host_desktop_type()));
   chrome::NewTab(browser2);
   ui_test_utils::NavigateToURL(browser2,
                                test_server()->GetURL("files/form.html"));
-  browser2->window()->Close();
+  CloseBrowser(browser2);
 
   // Set different startup preferences for the 2 profiles.
   std::vector<GURL> urls1;
   urls1.push_back(ui_test_utils::GetTestUrl(
       base::FilePath(base::FilePath::kCurrentDirectory),
       base::FilePath(FILE_PATH_LITERAL("title1.html"))));
   std::vector<GURL> urls2;
   urls2.push_back(ui_test_utils::GetTestUrl(
       base::FilePath(base::FilePath::kCurrentDirectory),
       base::FilePath(FILE_PATH_LITERAL("title2.html"))));
@@ skipping 127 matching lines @@
   pref_urls.urls = urls;
   SessionStartupPref::SetStartupPref(profile_urls, pref_urls);
 
   // Open a page with profile_last.
   Browser* browser_last = new Browser(
       Browser::CreateParams(Browser::TYPE_TABBED, profile_last,
                             browser()->host_desktop_type()));
   chrome::NewTab(browser_last);
   ui_test_utils::NavigateToURL(browser_last,
                                test_server()->GetURL("files/empty.html"));
-  browser_last->window()->Close();
+  CloseBrowser(browser_last);
 
   // Close the main browser.
   chrome::HostDesktopType original_desktop_type =
       browser()->host_desktop_type();
-  browser()->window()->Close();
+  CloseBrowser(browser());
 
   // Do a simple non-process-startup browser launch.
   base::CommandLine dummy(base::CommandLine::NO_PROGRAM);
 
   StartupBrowserCreator browser_creator;
   std::vector<Profile*> last_opened_profiles;
   last_opened_profiles.push_back(profile_home1);
   last_opened_profiles.push_back(profile_home2);
   last_opened_profiles.push_back(profile_last);
   last_opened_profiles.push_back(profile_urls);
@@ skipping 77 matching lines @@
   std::vector<GURL> urls;
   urls.push_back(ui_test_utils::GetTestUrl(
       base::FilePath(base::FilePath::kCurrentDirectory),
       base::FilePath(FILE_PATH_LITERAL("title1.html"))));
 
   SessionStartupPref pref_urls(SessionStartupPref::URLS);
   pref_urls.urls = urls;
   SessionStartupPref::SetStartupPref(profile_urls, pref_urls);
 
   // Simulate a launch after an unclear exit.
-  browser()->window()->Close();
+  CloseBrowser(browser());
   static_cast<ProfileImpl*>(profile_home)->last_session_exit_type_ =
       Profile::EXIT_CRASHED;
   static_cast<ProfileImpl*>(profile_last)->last_session_exit_type_ =
       Profile::EXIT_CRASHED;
   static_cast<ProfileImpl*>(profile_urls)->last_session_exit_type_ =
       Profile::EXIT_CRASHED;
 
 #if !defined(OS_MACOSX) && !defined(GOOGLE_CHROME_BUILD)
   // Use HistogramTester to make sure a bubble is shown when it's not on
   // platform Mac OS X and it's not official Chrome build.
@@ skipping 503 matching lines @@
   ASSERT_EQ(1, tab_strip->count());
   EXPECT_EQ("title1.html",
             tab_strip->GetWebContentsAt(0)->GetURL().ExtractFileName());
 }
 #endif  // defined(ENABLE_CONFIGURATION_POLICY)
 
 #endif  // !defined(OS_LINUX) || !defined(GOOGLE_CHROME_BUILD) ||
         // defined(ENABLE_CONFIGURATION_POLICY)
 
 #endif  // !defined(OS_CHROMEOS)