Update popup blocker behavior and tests

chrome/browser/ui/blocked_content/popup_blocker_browsertest.cc

 // Copyright 2013 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 "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chrome_notification_types.h"
@@ skipping 120 matching lines @@
 
     if (what_to_expect == ExpectPopup) {
       ASSERT_EQ(2u,
                 chrome::GetBrowserCount(browser()->profile(),
                                         browser()->host_desktop_type()));
     } else {
       ASSERT_EQ(1u,
                 chrome::GetBrowserCount(browser()->profile(),
                                         browser()->host_desktop_type()));
       ASSERT_EQ(2, browser()->tab_strip_model()->count());
+
+      // Check that we always create foreground tabs.
+      ASSERT_EQ(1, browser()->tab_strip_model()->active_index());
     }
 
     ASSERT_EQ(0, GetBlockedContentsCount());
   }
 
   // Navigates to the test indicated by |test_name| using |browser| which is
   // expected to try to open a popup. Verifies that the popup was blocked and
   // then opens the blocked popup. Once the popup stopped loading, verifies
   // that the title of the page is "PASS" if |check_title| is set.
   //
@@ skipping 44 matching lines @@
     popup_blocker_helper->ShowBlockedPopup(iter->first);
 
     observer.Wait();
     Browser* new_browser;
     if (what_to_expect == ExpectPopup) {
       new_browser = browser_observer.WaitForSingleNewBrowser();
       web_contents = new_browser->tab_strip_model()->GetActiveWebContents();
     } else {
       new_browser = browser;
       EXPECT_EQ(2, browser->tab_strip_model()->count());
+      // Check that we always create foreground tabs.
+      EXPECT_EQ(1, browser->tab_strip_model()->active_index());
       web_contents = browser->tab_strip_model()->GetWebContentsAt(1);
     }
 
     if (check_title == CheckTitle) {
       // Check that the check passed.
       base::string16 expected_title(base::ASCIIToUTF16("PASS"));
       content::TitleWatcher title_watcher(web_contents, expected_title);
       EXPECT_EQ(expected_title, title_watcher.WaitAndGetTitle());
     }
 
     return web_contents;
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(PopupBlockerBrowserTest);
 };
 
 IN_PROC_BROWSER_TEST_F(PopupBlockerBrowserTest,
                        BlockWebContentsCreation) {
 #if defined(OS_WIN) && defined(USE_ASH)
   // Disable this test in Metro+Ash for now (http://crbug.com/262796).
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
     return;
 #endif
 
   RunCheckTest(
       browser(),
       "/popup_blocker/popup-blocked-to-post-blank.html",
-      ExpectPopup,
+      ExpectTab,
       DontCheckTitle);
 }
 
 IN_PROC_BROWSER_TEST_F(PopupBlockerBrowserTest,
                        BlockWebContentsCreationIncognito) {
 #if defined(OS_WIN) && defined(USE_ASH)
   // Disable this test in Metro+Ash for now (http://crbug.com/262796).
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
     return;
 #endif
 
   RunCheckTest(
       CreateIncognitoBrowser(),
       "/popup_blocker/popup-blocked-to-post-blank.html",
-      ExpectPopup,
+      ExpectTab,
       DontCheckTitle);
 }
 
-// Temporary. http://crbug.com/431335
 IN_PROC_BROWSER_TEST_F(PopupBlockerBrowserTest,
-                       DISABLED_PopupBlockedFakeClickOnAnchor) {
+                       PopupBlockedFakeClickOnAnchor) {
 #if defined(OS_WIN) && defined(USE_ASH)
   // Disable this test in Metro+Ash for now (http://crbug.com/262796).
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
     return;
 #endif
 
   RunCheckTest(
       browser(),
       "/popup_blocker/popup-fake-click-on-anchor.html",
       ExpectTab,
@@ skipping 114 matching lines @@
             model->CurrentMatch(NULL).contents);
 }
 
 // This test fails on linux AURA with this change
 // https://codereview.chromium.org/23903056
 // BUG=https://code.google.com/p/chromium/issues/detail?id=295299
 // TODO(ananta). Debug and fix this test.
 #if defined(USE_AURA) && defined(OS_LINUX)
 #define MAYBE_WindowFeatures DISABLED_WindowFeatures
 #else
-#define MAYBE_WindowFeatures WindowFeatures
+// TODO(jochen): Temporarily disabled, renable again after next blink roll.
+#define MAYBE_WindowFeatures DISABLED_WindowFeatures
 #endif
 IN_PROC_BROWSER_TEST_F(PopupBlockerBrowserTest, MAYBE_WindowFeatures) {
   WebContents* popup =
       RunCheckTest(browser(),
                    "/popup_blocker/popup-window-open.html",
                    ExpectPopup,
                    DontCheckTitle);
 
   // Check that the new popup has (roughly) the requested size.
   gfx::Size window_size = popup->GetContainerBounds().size();
   EXPECT_TRUE(349 <= window_size.width() && window_size.width() <= 351);
   EXPECT_TRUE(249 <= window_size.height() && window_size.height() <= 251);
 }
 
 IN_PROC_BROWSER_TEST_F(PopupBlockerBrowserTest, CorrectReferrer) {
   RunCheckTest(browser(),
                "/popup_blocker/popup-referrer.html",
-               ExpectPopup,
+               ExpectTab,
                CheckTitle);
 }
 
-IN_PROC_BROWSER_TEST_F(PopupBlockerBrowserTest, WindowFeaturesBarProps) {
+// TODO(jochen): Temporarily disabled, renable again after next blink roll.
+IN_PROC_BROWSER_TEST_F(PopupBlockerBrowserTest,
+                       DISABLED_WindowFeaturesBarProps) {
   RunCheckTest(browser(),
                "/popup_blocker/popup-windowfeatures.html",
-               ExpectPopup,
+               ExpectTab,
                CheckTitle);
 }
 
 IN_PROC_BROWSER_TEST_F(PopupBlockerBrowserTest, SessionStorage) {
   RunCheckTest(browser(),
                "/popup_blocker/popup-sessionstorage.html",
-               ExpectPopup,
+               ExpectTab,
                CheckTitle);
 }
 
 IN_PROC_BROWSER_TEST_F(PopupBlockerBrowserTest, Opener) {
   RunCheckTest(browser(),
                "/popup_blocker/popup-opener.html",
-               ExpectPopup,
+               ExpectTab,
                CheckTitle);
 }
 
 // Tests that the popup can still close itself after navigating. This tests that
 // the openedByDOM bit is preserved across blocked popups.
 IN_PROC_BROWSER_TEST_F(PopupBlockerBrowserTest, ClosableAfterNavigation) {
   // Open a popup.
   WebContents* popup =
       RunCheckTest(browser(),
                    "/popup_blocker/popup-opener.html",
-                   ExpectPopup,
+                   ExpectTab,
                    CheckTitle);
 
   // Navigate it elsewhere.
   content::TestNavigationObserver nav_observer(popup);
   popup->GetMainFrame()->ExecuteJavaScript(
       base::UTF8ToUTF16("location.href = '/empty.html'"));
   nav_observer.Wait();
 
   // Have it close itself.
   CloseObserver close_observer(popup);
   popup->GetMainFrame()->ExecuteJavaScript(
       base::UTF8ToUTF16("window.close()"));
   close_observer.Wait();
 }
 
-// Temporary. http://crbug.com/431335
-IN_PROC_BROWSER_TEST_F(PopupBlockerBrowserTest, DISABLED_OpenerSuppressed) {
+IN_PROC_BROWSER_TEST_F(PopupBlockerBrowserTest, OpenerSuppressed) {
   RunCheckTest(browser(),
                "/popup_blocker/popup-openersuppressed.html",
                ExpectTab,
                CheckTitle);
 }
 
 IN_PROC_BROWSER_TEST_F(PopupBlockerBrowserTest, ShiftClick) {
   RunCheckTest(
       browser(),
       "/popup_blocker/popup-fake-click-on-anchor3.html",
       ExpectPopup,
       CheckTitle);
 }
 
 IN_PROC_BROWSER_TEST_F(PopupBlockerBrowserTest, WebUI) {
   WebContents* popup =
       RunCheckTest(browser(),
                    "/popup_blocker/popup-webui.html",
-                   ExpectPopup,
+                   ExpectTab,
                    DontCheckTitle);
 
   // Check that the new popup displays about:blank.
   EXPECT_EQ(GURL(url::kAboutBlankURL), popup->GetURL());
 }
 
 // Verify that the renderer can't DOS the browser by creating arbitrarily many
 // popups.
 IN_PROC_BROWSER_TEST_F(PopupBlockerBrowserTest, DenialOfService) {
   GURL url(embedded_test_server()->GetURL("/popup_blocker/popup-dos.html"));
@@ skipping 17 matching lines @@
 
   ASSERT_EQ(1u, chrome::GetBrowserCount(browser()->profile(),
                                         browser()->host_desktop_type()));
   ASSERT_EQ(1, browser()->tab_strip_model()->count());
 
   // The popup from the unload event handler should not show up for about:blank.
   ASSERT_EQ(0, GetBlockedContentsCount());
 }
 
 }  // namespace