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

Side by Side Diff: content/test/test_render_frame_host.cc

Issue 1635873003: Replicating WebFrame::uniqueName across renderers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@dump-render-tree3
Patch Set: Removed unnecessary crbug comment. Created 4 years, 10 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/test/test_render_frame_host.h" 5 #include "content/test/test_render_frame_host.h"
6 6
7 #include "base/guid.h"
7 #include "content/browser/frame_host/frame_tree.h" 8 #include "content/browser/frame_host/frame_tree.h"
8 #include "content/browser/frame_host/navigation_handle_impl.h" 9 #include "content/browser/frame_host/navigation_handle_impl.h"
9 #include "content/browser/frame_host/navigation_request.h" 10 #include "content/browser/frame_host/navigation_request.h"
10 #include "content/browser/frame_host/navigator.h" 11 #include "content/browser/frame_host/navigator.h"
11 #include "content/browser/frame_host/navigator_impl.h" 12 #include "content/browser/frame_host/navigator_impl.h"
12 #include "content/browser/frame_host/render_frame_host_delegate.h" 13 #include "content/browser/frame_host/render_frame_host_delegate.h"
13 #include "content/browser/web_contents/web_contents_impl.h" 14 #include "content/browser/web_contents/web_contents_impl.h"
14 #include "content/common/frame_messages.h" 15 #include "content/common/frame_messages.h"
15 #include "content/public/browser/stream_handle.h" 16 #include "content/public/browser/stream_handle.h"
16 #include "content/public/common/browser_side_navigation_policy.h" 17 #include "content/public/common/browser_side_navigation_policy.h"
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 76
76 void TestRenderFrameHost::InitializeRenderFrameIfNeeded() { 77 void TestRenderFrameHost::InitializeRenderFrameIfNeeded() {
77 if (!render_view_host()->IsRenderViewLive()) { 78 if (!render_view_host()->IsRenderViewLive()) {
78 RenderViewHostTester::For(render_view_host())->CreateTestRenderView( 79 RenderViewHostTester::For(render_view_host())->CreateTestRenderView(
79 base::string16(), MSG_ROUTING_NONE, MSG_ROUTING_NONE, -1, false); 80 base::string16(), MSG_ROUTING_NONE, MSG_ROUTING_NONE, -1, false);
80 } 81 }
81 } 82 }
82 83
83 TestRenderFrameHost* TestRenderFrameHost::AppendChild( 84 TestRenderFrameHost* TestRenderFrameHost::AppendChild(
84 const std::string& frame_name) { 85 const std::string& frame_name) {
86 std::string frame_unique_name = base::GenerateGUID();
85 OnCreateChildFrame(GetProcess()->GetNextRoutingID(), 87 OnCreateChildFrame(GetProcess()->GetNextRoutingID(),
86 blink::WebTreeScopeType::Document, frame_name, 88 blink::WebTreeScopeType::Document, frame_name,
87 blink::WebSandboxFlags::None, 89 frame_unique_name, blink::WebSandboxFlags::None,
88 blink::WebFrameOwnerProperties()); 90 blink::WebFrameOwnerProperties());
89 return static_cast<TestRenderFrameHost*>( 91 return static_cast<TestRenderFrameHost*>(
90 child_creation_observer_.last_created_frame()); 92 child_creation_observer_.last_created_frame());
91 } 93 }
92 94
93 void TestRenderFrameHost::SimulateNavigationStart(const GURL& url) { 95 void TestRenderFrameHost::SimulateNavigationStart(const GURL& url) {
94 if (IsBrowserSideNavigationEnabled()) { 96 if (IsBrowserSideNavigationEnabled()) {
95 SendRendererInitiatedNavigationRequest(url, false); 97 SendRendererInitiatedNavigationRequest(url, false);
96 return; 98 return;
97 } 99 }
(...skipping 313 matching lines...) Expand 10 before | Expand all | Expand 10 after
411 // cleared during DidFailProvisionalLoad). 413 // cleared during DidFailProvisionalLoad).
412 int page_id = entry ? entry->GetPageID() : -1; 414 int page_id = entry ? entry->GetPageID() : -1;
413 if (page_id == -1) { 415 if (page_id == -1) {
414 WebContentsImpl* web_contents = static_cast<WebContentsImpl*>(delegate()); 416 WebContentsImpl* web_contents = static_cast<WebContentsImpl*>(delegate());
415 page_id = web_contents->GetMaxPageIDForSiteInstance(GetSiteInstance()) + 1; 417 page_id = web_contents->GetMaxPageIDForSiteInstance(GetSiteInstance()) + 1;
416 } 418 }
417 return page_id; 419 return page_id;
418 } 420 }
419 421
420 } // namespace content 422 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698