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

Unified Diff: content/browser/frame_host/render_frame_host_manager_unittest.cc

Issue 1141283002: Replicate whether a frame is in a document or shadow tree. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix typo Created 5 years, 7 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/frame_host/render_frame_host_manager_unittest.cc
diff --git a/content/browser/frame_host/render_frame_host_manager_unittest.cc b/content/browser/frame_host/render_frame_host_manager_unittest.cc
index ec75f5b95fea8a3234e965c3239e72771ac7540d..cf1545a5a2d00cce455eb538d7369b02f3480e9a 100644
--- a/content/browser/frame_host/render_frame_host_manager_unittest.cc
+++ b/content/browser/frame_host/render_frame_host_manager_unittest.cc
@@ -670,8 +670,8 @@ TEST_F(RenderFrameHostManagerTest, DropCreateChildFrameWhileSwappedOut) {
{
RenderFrameHostCreatedObserver observer(contents());
initial_rfh->OnCreateChildFrame(
- initial_rfh->GetProcess()->GetNextRoutingID(), std::string(),
- SandboxFlags::NONE);
+ initial_rfh->GetProcess()->GetNextRoutingID(),
+ blink::WebTreeScopeType::Document, std::string(), SandboxFlags::NONE);
EXPECT_TRUE(observer.created());
}
@@ -693,8 +693,8 @@ TEST_F(RenderFrameHostManagerTest, DropCreateChildFrameWhileSwappedOut) {
// to create child frames.
RenderFrameHostCreatedObserver observer(contents());
initial_rfh->OnCreateChildFrame(
- initial_rfh->GetProcess()->GetNextRoutingID(), std::string(),
- SandboxFlags::NONE);
+ initial_rfh->GetProcess()->GetNextRoutingID(),
+ blink::WebTreeScopeType::Document, std::string(), SandboxFlags::NONE);
EXPECT_FALSE(observer.created());
}
}
@@ -1976,10 +1976,10 @@ TEST_F(RenderFrameHostManagerTest, DetachPendingChild) {
contents()->NavigateAndCommit(kUrlA);
contents()->GetMainFrame()->OnCreateChildFrame(
contents()->GetMainFrame()->GetProcess()->GetNextRoutingID(),
- std::string("frame_name"), SandboxFlags::NONE);
+ blink::WebTreeScopeType::Document, "frame_name", SandboxFlags::NONE);
contents()->GetMainFrame()->OnCreateChildFrame(
contents()->GetMainFrame()->GetProcess()->GetNextRoutingID(),
- std::string("frame_name"), SandboxFlags::NONE);
+ blink::WebTreeScopeType::Document, "frame_name", SandboxFlags::NONE);
RenderFrameHostManager* root_manager =
contents()->GetFrameTree()->root()->render_manager();
RenderFrameHostManager* iframe1 =
@@ -2117,7 +2117,7 @@ TEST_F(RenderFrameHostManagerTest, TwoTabsCrashOneReloadsOneLeaves) {
// |contents1| creates an out of process iframe.
contents1->GetMainFrame()->OnCreateChildFrame(
contents1->GetMainFrame()->GetProcess()->GetNextRoutingID(),
- std::string("frame_name"), SandboxFlags::NONE);
+ blink::WebTreeScopeType::Document, "frame_name", SandboxFlags::NONE);
RenderFrameHostManager* iframe =
contents()->GetFrameTree()->root()->child_at(0)->render_manager();
NavigationEntryImpl entry(NULL /* instance */, -1 /* page_id */, kUrl2,

Powered by Google App Engine
This is Rietveld 408576698