Update tests for snapshot allowfullscreen behavior

chrome/browser/site_per_process_interactive_browsertest.cc

 // Copyright 2016 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/strings/string_number_conversions.h"
 #include "base/test/scoped_feature_list.h"
 #include "base/test/test_timeouts.h"
 #include "chrome/browser/password_manager/chrome_password_manager_client.h"
 #include "chrome/browser/renderer_context_menu/render_view_context_menu_browsertest_util.h"
@@ skipping 563 matching lines @@
   bool has_style = false;
   std::string script = base::StringPrintf(
       "domAutomationController.send("
       "    document.querySelectorAll("
       "        '#%s:-webkit-full-screen-ancestor').length == 1)",
       element_id.c_str());
   EXPECT_TRUE(ExecuteScriptAndExtractBool(host, script, &has_style));
   return has_style;
 }
 
-// Set the allowFullscreen attribute on the <iframe> element identified by
-// |frame_id|.
-void SetAllowFullscreenForFrame(content::RenderFrameHost* host,
-                                const std::string& frame_id) {
-  EXPECT_TRUE(ExecuteScript(
-      host, base::StringPrintf(
-                "document.getElementById('%s').allowFullscreen = true;",
-                frame_id.c_str())));
-}
-
 // Add a listener that will send back a message whenever the (prefixed)
 // fullscreenchange event fires.  The message will be "fullscreenchange",
 // followed by a space and the provided |id|.
 void AddFullscreenChangeListener(content::RenderFrameHost* frame,
                                  const std::string& id) {
   std::string script = base::StringPrintf(
       "document.addEventListener('webkitfullscreenchange', function() {"
       "    domAutomationController.setAutomationId(0);"
       "    domAutomationController.send('fullscreenchange %s');});",
       id.c_str());
@@ skipping 134 matching lines @@
   EXPECT_EQ("none", GetFullscreenElementId(child));
 }
 
 // Check that on a page with A-embed-B-embed-A frame hierarchy, an element in
 // the bottom frame can enter and exit fullscreen.  |exit_method| specifies
 // whether to use browser-initiated vs. renderer-initiated fullscreen exit
 // (i.e., pressing escape vs. a JS call), since they trigger different code
 // paths on the Blink side.
 void SitePerProcessInteractiveBrowserTest::FullscreenElementInABA(
     FullscreenExitMethod exit_method) {
-  GURL main_url(embedded_test_server()->GetURL(
-      "a.com", "/cross_site_iframe_factory.html?a(b(a))"));
+  GURL main_url(embedded_test_server()->GetURL("a.com",
+                                               "/cross_site_iframe_factory."
+                                               "html?a(b{allowfullscreen}(a{"
+                                               "allowfullscreen}))"));
   ui_test_utils::NavigateToURL(browser(), main_url);
   content::WebContents* web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
 
   content::RenderFrameHost* main_frame = web_contents->GetMainFrame();
   content::RenderFrameHost* child = ChildFrameAt(main_frame, 0);
   content::RenderFrameHost* grandchild = ChildFrameAt(child, 0);
 
   // Navigate the bottom frame to a page that has a fullscreenable <div>.
   content::TestNavigationObserver observer(web_contents);
   EXPECT_TRUE(
       ExecuteScript(grandchild, "location.href = '/fullscreen_frame.html'"));
   observer.Wait();
   EXPECT_EQ(embedded_test_server()->GetURL("a.com", "/fullscreen_frame.html"),
             grandchild->GetLastCommittedURL());
 
-  // Add allowFullscreen attribute to both <iframe> elements.
-  SetAllowFullscreenForFrame(main_frame, "child-0");
-  SetAllowFullscreenForFrame(child, "child-0");
-
   // Make fullscreenchange events in all three frames send a message.
   AddFullscreenChangeListener(main_frame, "main_frame");
   AddFullscreenChangeListener(child, "child");
   AddFullscreenChangeListener(grandchild, "grandchild");
 
   // Add a resize event handler that will send a message when the grandchild
   // frame is resized to the screen size.  Also save its original size.
   AddResizeListener(grandchild, GetScreenSize());
   gfx::Size original_grandchild_size = GetFrameSize(grandchild);
 
@@ skipping 95 matching lines @@
 //
 // The c_middle frame will trigger fullscreen for its <div> element.  The test
 // verifies that its ancestor chain is properly updated for fullscreen, and
 // that the b_first node that's not on the chain is not affected.
 //
 // The test also exits fullscreen by simulating pressing ESC rather than using
 // document.webkitExitFullscreen(), which tests the browser-initiated
 // fullscreen exit path.
 IN_PROC_BROWSER_TEST_F(SitePerProcessInteractiveBrowserTest,
                        FullscreenElementInMultipleSubframes) {
+  // Allow fullscreen in all iframes descending to |c_middle|.
   GURL main_url(embedded_test_server()->GetURL(
-      "a.com", "/cross_site_iframe_factory.html?a(a(b,b(c(c))))"));
+      "a.com",
+      "/cross_site_iframe_factory.html?a(a{allowfullscreen}(b,b{"
+      "allowfullscreen}(c{allowfullscreen}(c{allowfullscreen}))))"));
   ui_test_utils::NavigateToURL(browser(), main_url);
   content::WebContents* web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
 
   content::RenderFrameHost* a_top = web_contents->GetMainFrame();
   content::RenderFrameHost* a_bottom = ChildFrameAt(a_top, 0);
   content::RenderFrameHost* b_first = ChildFrameAt(a_bottom, 0);
   content::RenderFrameHost* b_second = ChildFrameAt(a_bottom, 1);
   content::RenderFrameHost* c_top = ChildFrameAt(b_second, 0);
   content::RenderFrameHost* c_middle = ChildFrameAt(c_top, 0);
 
-  // Allow fullscreen in all iframes descending to |c_middle|.  This relies on
-  // IDs that cross_site_iframe_factory assigns to child frames.
-  SetAllowFullscreenForFrame(a_top, "child-0");
-  SetAllowFullscreenForFrame(a_bottom, "child-1");
-  SetAllowFullscreenForFrame(b_second, "child-0");
-  SetAllowFullscreenForFrame(c_top, "child-0");
-
   // Navigate |c_middle| to a page that has a fullscreenable <div> and another
   // frame.
   content::TestNavigationObserver observer(web_contents);
   EXPECT_TRUE(
       ExecuteScript(c_middle, "location.href = '/fullscreen_frame.html'"));
   observer.Wait();
   EXPECT_EQ(embedded_test_server()->GetURL("c.com", "/fullscreen_frame.html"),
             c_middle->GetLastCommittedURL());
   content::RenderFrameHost* c_bottom = ChildFrameAt(c_middle, 0);
 
@@ skipping 552 matching lines @@
   }
 
   // To make sure we never clicked into the date picker, get current date value
   // and make sure it matches the cached value.
   std::string date;
   ASSERT_TRUE(ExecuteScriptAndExtractString(
       child_frame, "window.domAutomationController.send(input.value);", &date));
   EXPECT_EQ(cached_date, date) << "Cached date was '" << cached_date
                                << "' but current date is '" << date << "'.";
 }