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

Unified Diff: content/renderer/render_view_browsertest.cc

Issue 1773813007: blink: Rename modules/ method to prefix with get when they collide. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: clash-modules: rebase-fixes Created 4 years, 9 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
« no previous file with comments | « content/renderer/render_frame_impl.cc ('k') | content/renderer/render_view_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_view_browsertest.cc
diff --git a/content/renderer/render_view_browsertest.cc b/content/renderer/render_view_browsertest.cc
index be020d4c0faff2ee32c4420d8ac46ff24f973ec0..a47e73dfdb4ae0edb2a1e236f7916065d51c5940 100644
--- a/content/renderer/render_view_browsertest.cc
+++ b/content/renderer/render_view_browsertest.cc
@@ -178,7 +178,7 @@ FrameReplicationState ReconstructReplicationStateForTesting(
result.sandbox_flags = frame->effectiveSandboxFlags();
// result.should_enforce_strict_mixed_content_checking is calculated in the
// browser...
- result.origin = frame->securityOrigin();
+ result.origin = frame->getSecurityOrigin();
return result;
}
@@ -932,7 +932,8 @@ TEST_F(RenderViewImplTest, OriginReplicationForSwapOut) {
EXPECT_TRUE(web_frame->firstChild()->isWebRemoteFrame());
// Expect the origin to be updated properly.
- blink::WebSecurityOrigin origin = web_frame->firstChild()->securityOrigin();
+ blink::WebSecurityOrigin origin =
+ web_frame->firstChild()->getSecurityOrigin();
EXPECT_EQ(origin.toString(),
WebString::fromUTF8(replication_state.origin.Serialize()));
@@ -943,7 +944,7 @@ TEST_F(RenderViewImplTest, OriginReplicationForSwapOut) {
RenderFrame::FromWebFrame(web_frame->lastChild()));
child_frame2->SwapOut(kProxyRoutingId + 1, true, replication_state);
EXPECT_TRUE(web_frame->lastChild()->isWebRemoteFrame());
- EXPECT_TRUE(web_frame->lastChild()->securityOrigin().isUnique());
+ EXPECT_TRUE(web_frame->lastChild()->getSecurityOrigin().isUnique());
}
// Test for https://crbug.com/568676, where a parent detaches a remote child
« no previous file with comments | « content/renderer/render_frame_impl.cc ('k') | content/renderer/render_view_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698