Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1665)

Unified Diff: content/browser/site_per_process_browsertest.cc

Issue 2156883002: Use content::FrameOwnerProperties instead of blink::WebFrameOwnerProperties in content/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@permission-delegation-frame-owner-properties
Patch Set: Use this everywhere Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/site_per_process_browsertest.cc
diff --git a/content/browser/site_per_process_browsertest.cc b/content/browser/site_per_process_browsertest.cc
index 9e5c99ab29b9aac99982db702d8c2d7df3547138..b88c52bfb21f41a22fb1537ef58499e94d05bf36 100644
--- a/content/browser/site_per_process_browsertest.cc
+++ b/content/browser/site_per_process_browsertest.cc
@@ -7377,14 +7377,14 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, AllowFullscreen) {
EXPECT_TRUE(is_fullscreen_allowed(root));
EXPECT_TRUE(is_fullscreen_allowed(root->child_at(0)));
- EXPECT_TRUE(root->child_at(0)->frame_owner_properties().allowFullscreen);
+ EXPECT_TRUE(root->child_at(0)->frame_owner_properties().allow_fullscreen);
// Now navigate to a page with two <iframe>'s, both without allowFullscreen.
GURL url_2(embedded_test_server()->GetURL(
"a.com", "/cross_site_iframe_factory.html?a(b,c)"));
EXPECT_TRUE(NavigateToURL(shell(), url_2));
- EXPECT_FALSE(root->child_at(0)->frame_owner_properties().allowFullscreen);
- EXPECT_FALSE(root->child_at(1)->frame_owner_properties().allowFullscreen);
+ EXPECT_FALSE(root->child_at(0)->frame_owner_properties().allow_fullscreen);
+ EXPECT_FALSE(root->child_at(1)->frame_owner_properties().allow_fullscreen);
EXPECT_TRUE(is_fullscreen_allowed(root));
EXPECT_FALSE(is_fullscreen_allowed(root->child_at(0)));
@@ -7393,8 +7393,8 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, AllowFullscreen) {
// Dynamically enable fullscreen for first subframe and check that the
// fullscreen property was updated on the FrameTreeNode.
EXPECT_TRUE(ExecuteScript(
- root, "document.getElementById('child-0').allowFullscreen='true'"));
- EXPECT_TRUE(root->child_at(0)->frame_owner_properties().allowFullscreen);
+ root, "document.getElementById('child-0').allow_fullscreen='true'"));
alexmos 2016/07/19 00:15:56 I don't think you want to change this. This is th
raymes 2016/07/19 05:53:09 Oops - find/replace failed me :(
+ EXPECT_TRUE(root->child_at(0)->frame_owner_properties().allow_fullscreen);
// Check that the first subframe is now allowed to go fullscreen. Other
// frames shouldn't be affected.
@@ -7414,7 +7414,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, AllowFullscreen) {
// Dynamically enable fullscreen for bottom subframe.
EXPECT_TRUE(ExecuteScript(
root->child_at(0),
- "document.getElementById('child-0').allowFullscreen='true'"));
+ "document.getElementById('child-0').allow_fullscreen='true'"));
alexmos 2016/07/19 00:15:56 Ditto.
raymes 2016/07/19 05:53:09 Done.
// This still shouldn't allow the bottom child to go fullscreen, since the
// top frame hasn't allowed fullscreen for the middle frame.
@@ -7424,7 +7424,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, AllowFullscreen) {
// Now allow fullscreen for the middle frame.
EXPECT_TRUE(ExecuteScript(
- root, "document.getElementById('child-0').allowFullscreen='true'"));
+ root, "document.getElementById('child-0').allow_fullscreen='true'"));
alexmos 2016/07/19 00:15:56 Ditto.
raymes 2016/07/19 05:53:09 Done.
// All frames should be allowed to go fullscreen now.
EXPECT_TRUE(is_fullscreen_allowed(root));

Powered by Google App Engine
This is Rietveld 408576698