Try to restore window.opener when opening blocked popups

chrome/browser/ui/blocked_content/popup_blocker_browsertest.cc

Index: chrome/browser/ui/blocked_content/popup_blocker_browsertest.cc
diff --git a/chrome/browser/ui/blocked_content/popup_blocker_browsertest.cc b/chrome/browser/ui/blocked_content/popup_blocker_browsertest.cc
index dfb10d94fd73d157b7888ed4ba5d765518422787..685dbc63dd44f8deb7e5ca1327a1f9eab7b321a0 100644
--- a/chrome/browser/ui/blocked_content/popup_blocker_browsertest.cc
+++ b/chrome/browser/ui/blocked_content/popup_blocker_browsertest.cc
@@ -231,6 +231,56 @@ class BetterPopupBlockerBrowserTest : public PopupBlockerBrowserTest {
     InProcessBrowserTest::SetUpCommandLine(command_line);
   }
 
+  void RunCheckTest(const base::FilePath& test_name, bool expect_new_browser) {

[Charlie Reis, 2013/07/30 01:26:30]

Can you add a comment here saying something about how each test is expected to
behave (e.g., get a popup blocked, then allow it to open, possibly in a new
window)?  Due to the "if the popup blocker blocked" comment below, I was
confused about whether all tests expect the popup to be blocked.

+    GURL url(ui_test_utils::GetTestUrl(base::FilePath(kTestDir), test_name));
+
+    CountRenderViewHosts counter;
+
+    ui_test_utils::NavigateToURL(browser(), url);
+
+    // If the popup blocker blocked the window.open, there should be only one
+    // tab.
+    EXPECT_EQ(1u, chrome::GetBrowserCount(browser()->profile(),
+                                          browser()->host_desktop_type()));
+    EXPECT_EQ(1, browser()->tab_strip_model()->count());
+    WebContents* web_contents =
+        browser()->tab_strip_model()->GetActiveWebContents();
+    EXPECT_EQ(url, web_contents->GetURL());
+
+    // And no new RVH created.
+    EXPECT_EQ(0, counter.GetRenderViewHostCreatedCount());
+
+    content::WindowedNotificationObserver observer(
+        chrome::NOTIFICATION_TAB_ADDED,
+        content::NotificationService::AllSources());
+    ui_test_utils::BrowserAddedObserver browser_observer;
+
+    // Launch the blocked popup.
+    PopupBlockerTabHelper* popup_blocker_helper =
+        PopupBlockerTabHelper::FromWebContents(web_contents);
+    EXPECT_EQ(1u, popup_blocker_helper->GetBlockedPopupsCount());
+    std::map<int32, GURL> blocked_requests =
+        popup_blocker_helper->GetBlockedPopupRequests();
+    std::map<int32, GURL>::const_iterator iter = blocked_requests.begin();
+    popup_blocker_helper->ShowBlockedPopup(iter->first);
+
+    observer.Wait();
+    Browser* new_browser;
+    if (expect_new_browser) {
+      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());
+      web_contents = browser()->tab_strip_model()->GetWebContentsAt(1);
+    }
+
+    // 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());
+  }
+
  private:
   DISALLOW_COPY_AND_ASSIGN(BetterPopupBlockerBrowserTest);
 };
@@ -372,91 +422,26 @@ IN_PROC_BROWSER_TEST_F(BetterPopupBlockerBrowserTest, WindowFeatures) {
 }
 
 IN_PROC_BROWSER_TEST_F(BetterPopupBlockerBrowserTest, CorrectReferrer) {
-  GURL url(ui_test_utils::GetTestUrl(
-      base::FilePath(kTestDir),
-      base::FilePath(FILE_PATH_LITERAL("popup-referrer.html"))));
-
-  CountRenderViewHosts counter;
-
-  ui_test_utils::NavigateToURL(browser(), url);
-
-  // If the popup blocker blocked the blank post, there should be only one tab.
-  EXPECT_EQ(1u, chrome::GetBrowserCount(browser()->profile(),
-                                        browser()->host_desktop_type()));
-  EXPECT_EQ(1, browser()->tab_strip_model()->count());
-  WebContents* web_contents =
-      browser()->tab_strip_model()->GetActiveWebContents();
-  EXPECT_EQ(url, web_contents->GetURL());
-
-  // And no new RVH created.
-  EXPECT_EQ(0, counter.GetRenderViewHostCreatedCount());
-
-  content::WindowedNotificationObserver observer(
-      chrome::NOTIFICATION_TAB_ADDED,
-      content::NotificationService::AllSources());
-  ui_test_utils::BrowserAddedObserver browser_observer;
-
-  // Launch the blocked popup.
-  PopupBlockerTabHelper* popup_blocker_helper =
-      PopupBlockerTabHelper::FromWebContents(web_contents);
-  EXPECT_EQ(1u, popup_blocker_helper->GetBlockedPopupsCount());
-  std::map<int32, GURL> blocked_requests =
-      popup_blocker_helper->GetBlockedPopupRequests();
-  std::map<int32, GURL>::const_iterator iter = blocked_requests.begin();
-  popup_blocker_helper->ShowBlockedPopup(iter->first);
-
-  observer.Wait();
-  Browser* new_browser = browser_observer.WaitForSingleNewBrowser();
-
-  // Check that the referrer was correctly set.
-  web_contents = new_browser->tab_strip_model()->GetActiveWebContents();
-  base::string16 expected_title(base::ASCIIToUTF16("PASS"));
-  content::TitleWatcher title_watcher(web_contents, expected_title);
-  EXPECT_EQ(expected_title, title_watcher.WaitAndGetTitle());
+  RunCheckTest(base::FilePath(FILE_PATH_LITERAL("popup-referrer.html")), true);
 }
 
 IN_PROC_BROWSER_TEST_F(BetterPopupBlockerBrowserTest, WindowFeaturesBarProps) {
-  GURL url(ui_test_utils::GetTestUrl(
-      base::FilePath(kTestDir),
-      base::FilePath(FILE_PATH_LITERAL("popup-windowfeatures.html"))));
-
-  CountRenderViewHosts counter;
-
-  ui_test_utils::NavigateToURL(browser(), url);
-
-  // If the popup blocker blocked the blank post, there should be only one tab.
-  EXPECT_EQ(1u, chrome::GetBrowserCount(browser()->profile(),
-                                        browser()->host_desktop_type()));
-  EXPECT_EQ(1, browser()->tab_strip_model()->count());
-  WebContents* web_contents =
-      browser()->tab_strip_model()->GetActiveWebContents();
-  EXPECT_EQ(url, web_contents->GetURL());
-
-  // And no new RVH created.
-  EXPECT_EQ(0, counter.GetRenderViewHostCreatedCount());
-
-  content::WindowedNotificationObserver observer(
-      chrome::NOTIFICATION_TAB_ADDED,
-      content::NotificationService::AllSources());
-  ui_test_utils::BrowserAddedObserver browser_observer;
+  RunCheckTest(base::FilePath(FILE_PATH_LITERAL("popup-windowfeatures.html")),
+               true);
+}
 
-  // Launch the blocked popup.
-  PopupBlockerTabHelper* popup_blocker_helper =
-      PopupBlockerTabHelper::FromWebContents(web_contents);
-  EXPECT_EQ(1u, popup_blocker_helper->GetBlockedPopupsCount());
-  std::map<int32, GURL> blocked_requests =
-      popup_blocker_helper->GetBlockedPopupRequests();
-  std::map<int32, GURL>::const_iterator iter = blocked_requests.begin();
-  popup_blocker_helper->ShowBlockedPopup(iter->first);
+IN_PROC_BROWSER_TEST_F(BetterPopupBlockerBrowserTest, SessionStorage) {
+  RunCheckTest(base::FilePath(FILE_PATH_LITERAL("popup-sessionstorage.html")),
+               true);
+}
 
-  observer.Wait();
-  Browser* new_browser = browser_observer.WaitForSingleNewBrowser();
+IN_PROC_BROWSER_TEST_F(BetterPopupBlockerBrowserTest, Opener) {
+  RunCheckTest(base::FilePath(FILE_PATH_LITERAL("popup-opener.html")), true);
+}
 
-  // Check that the referrer was correctly set.
-  web_contents = new_browser->tab_strip_model()->GetActiveWebContents();
-  base::string16 expected_title(base::ASCIIToUTF16("PASS"));
-  content::TitleWatcher title_watcher(web_contents, expected_title);
-  EXPECT_EQ(expected_title, title_watcher.WaitAndGetTitle());
+IN_PROC_BROWSER_TEST_F(BetterPopupBlockerBrowserTest, OpenerSuppressed) {
+  RunCheckTest(
+      base::FilePath(FILE_PATH_LITERAL("popup-openersuppressed.html")), false);
 }
 
 }  // namespace