Reenable BrowserTest.WindowOpenClose

chrome/browser/ui/browser_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 <string>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
@@ skipping 1745 matching lines @@
   // The normal browser should now have four.
   EXPECT_EQ(4, browser()->tab_strip_model()->count());
 
   // Close the additional browsers.
   popup_browser->tab_strip_model()->CloseAllTabs();
   app_browser->tab_strip_model()->CloseAllTabs();
   app_popup_browser->tab_strip_model()->CloseAllTabs();
 }
 #endif
 
-// TODO(jochen): Rerwite test to not rely on popup blocker to hide popups.
-IN_PROC_BROWSER_TEST_F(BrowserTest, DISABLED_WindowOpenClose) {
+IN_PROC_BROWSER_TEST_F(BrowserTest, WindowOpenClose) {
+  CommandLine::ForCurrentProcess()->AppendSwitch(
+      switches::kDisablePopupBlocking);
   GURL url = ui_test_utils::GetTestUrl(
       base::FilePath(), base::FilePath().AppendASCII("window.close.html"));
 
   string16 title = ASCIIToUTF16("Title Of Awesomeness");
   content::TitleWatcher title_watcher(
       browser()->tab_strip_model()->GetActiveWebContents(), title);
   ui_test_utils::NavigateToURLBlockUntilNavigationsComplete(browser(), url, 2);
   EXPECT_EQ(title, title_watcher.WaitAndGetTitle());
 }
 
@@ skipping 460 matching lines @@
   RunTest(browser(), GetHrefURL(), modifiers, button, disposition);
 }
 
 // Shift-middle-clicks open in a foreground tab.
 IN_PROC_BROWSER_TEST_F(ClickModifierTest, HrefShiftMiddleClickTest) {
   int modifiers = WebKit::WebInputEvent::ShiftKey;
   WebKit::WebMouseEvent::Button button = WebKit::WebMouseEvent::ButtonMiddle;
   WindowOpenDisposition disposition = NEW_FOREGROUND_TAB;
   RunTest(browser(), GetHrefURL(), modifiers, button, disposition);
 }