Preserve Page::openedByDOM state across process swaps.

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/path_service.h"
+#include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "chrome/browser/autocomplete/autocomplete_result.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/ui/blocked_content/popup_blocker_tab_helper.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/omnibox/location_bar.h"
 #include "chrome/browser/ui/omnibox/omnibox_edit_model.h"
 #include "chrome/browser/ui/omnibox/omnibox_view.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/test_switches.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_service.h"
+#include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents.h"
+#include "content/public/browser/web_contents_observer.h"
 #include "content/public/browser/web_contents_view.h"
 #include "content/public/common/url_constants.h"
 #include "content/public/test/browser_test_utils.h"
+#include "content/public/test/test_navigation_observer.h"
 #include "net/dns/mock_host_resolver.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using content::WebContents;
 
 namespace {
 
 // Counts the number of RenderViewHosts created.
 class CountRenderViewHosts : public content::NotificationObserver {
@@ skipping 15 matching lines @@
     count_++;
   }
 
   content::NotificationRegistrar registrar_;
 
   int count_;
 
   DISALLOW_COPY_AND_ASSIGN(CountRenderViewHosts);
 };
 
+class CloseObserver : public content::WebContentsObserver {
+ public:
+  explicit CloseObserver(WebContents* contents)
+      : content::WebContentsObserver(contents) {}
+
+  void Wait() {
+    close_loop_.Run();
+  }
+
+  virtual void WebContentsDestroyed(WebContents* contents) OVERRIDE {
+    close_loop_.Quit();
+  }
+
+ private:
+  base::RunLoop close_loop_;
+};

[jochen (gone - plz use gerrit), 2014/04/16 08:58:30]

nit. DISALLOW_COPY_AND_ASSIGN()

[davidben, 2014/04/16 16:15:09]

Done.

+
 class PopupBlockerBrowserTest : public InProcessBrowserTest {
  public:
   PopupBlockerBrowserTest() {}
   virtual ~PopupBlockerBrowserTest() {}
 
   virtual void SetUpOnMainThread() OVERRIDE {
     InProcessBrowserTest::SetUpOnMainThread();
 
     host_resolver()->AddRule("*", "127.0.0.1");
     ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
@@ skipping 299 matching lines @@
                true);
 }
 
 IN_PROC_BROWSER_TEST_F(PopupBlockerBrowserTest, Opener) {
   RunCheckTest(browser(),
                "/popup_blocker/popup-opener.html",
                true,
                true);
 }
 
+// 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",
+                   true,
+                   true);
+
+  // 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();
+}
+
 IN_PROC_BROWSER_TEST_F(PopupBlockerBrowserTest, OpenerSuppressed) {
   RunCheckTest(browser(),
                "/popup_blocker/popup-openersuppressed.html",
                false,
                true);
 }
 
 IN_PROC_BROWSER_TEST_F(PopupBlockerBrowserTest, ShiftClick) {
   RunCheckTest(
       browser(),
@@ skipping 15 matching lines @@
 
 // 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"));
   ui_test_utils::NavigateToURL(browser(), url);
   ASSERT_EQ(25, GetBlockedContentsCount());
 }
 
 }  // namespace