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

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

Issue 1874543002: Inside of content, prefer SiteInstanceImpl to SiteInstance. Base URL: https://chromium.googlesource.com/chromium/src.git@site_instance_unittest
Patch Set: Created 4 years, 8 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
« no previous file with comments | « content/test/test_render_frame_host.h ('k') | content/test/test_render_frame_host_factory.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "base/guid.h"
8 #include "content/browser/frame_host/frame_tree.h" 8 #include "content/browser/frame_host/frame_tree.h"
9 #include "content/browser/frame_host/navigation_handle_impl.h" 9 #include "content/browser/frame_host/navigation_handle_impl.h"
10 #include "content/browser/frame_host/navigation_request.h" 10 #include "content/browser/frame_host/navigation_request.h"
(...skipping 22 matching lines...) Expand all
33 } 33 }
34 34
35 TestRenderFrameHostCreationObserver::~TestRenderFrameHostCreationObserver() { 35 TestRenderFrameHostCreationObserver::~TestRenderFrameHostCreationObserver() {
36 } 36 }
37 37
38 void TestRenderFrameHostCreationObserver::RenderFrameCreated( 38 void TestRenderFrameHostCreationObserver::RenderFrameCreated(
39 RenderFrameHost* render_frame_host) { 39 RenderFrameHost* render_frame_host) {
40 last_created_frame_ = render_frame_host; 40 last_created_frame_ = render_frame_host;
41 } 41 }
42 42
43 TestRenderFrameHost::TestRenderFrameHost(SiteInstance* site_instance, 43 TestRenderFrameHost::TestRenderFrameHost(SiteInstanceImpl* site_instance,
44 RenderViewHostImpl* render_view_host, 44 RenderViewHostImpl* render_view_host,
45 RenderFrameHostDelegate* delegate, 45 RenderFrameHostDelegate* delegate,
46 RenderWidgetHostDelegate* rwh_delegate, 46 RenderWidgetHostDelegate* rwh_delegate,
47 FrameTree* frame_tree, 47 FrameTree* frame_tree,
48 FrameTreeNode* frame_tree_node, 48 FrameTreeNode* frame_tree_node,
49 int32_t routing_id, 49 int32_t routing_id,
50 int32_t widget_routing_id, 50 int32_t widget_routing_id,
51 int flags) 51 int flags)
52 : RenderFrameHostImpl(site_instance, 52 : RenderFrameHostImpl(site_instance,
53 render_view_host, 53 render_view_host,
(...skipping 375 matching lines...) Expand 10 before | Expand all | Expand 10 after
429 // cleared during DidFailProvisionalLoad). 429 // cleared during DidFailProvisionalLoad).
430 int page_id = entry ? entry->GetPageID() : -1; 430 int page_id = entry ? entry->GetPageID() : -1;
431 if (page_id == -1) { 431 if (page_id == -1) {
432 WebContentsImpl* web_contents = static_cast<WebContentsImpl*>(delegate()); 432 WebContentsImpl* web_contents = static_cast<WebContentsImpl*>(delegate());
433 page_id = web_contents->GetMaxPageIDForSiteInstance(GetSiteInstance()) + 1; 433 page_id = web_contents->GetMaxPageIDForSiteInstance(GetSiteInstance()) + 1;
434 } 434 }
435 return page_id; 435 return page_id;
436 } 436 }
437 437
438 } // namespace content 438 } // namespace content
OLDNEW
« no previous file with comments | « content/test/test_render_frame_host.h ('k') | content/test/test_render_frame_host_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698