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

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

Issue 851333005: Revert of Make RenderFrame(Host) own a RenderWidget(Host). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 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/command_line.h" 7 #include "base/command_line.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_request.h" 9 #include "content/browser/frame_host/navigation_request.h"
10 #include "content/browser/frame_host/navigator.h" 10 #include "content/browser/frame_host/navigator.h"
(...skipping 18 matching lines...) Expand all
29 TestRenderFrameHostCreationObserver::~TestRenderFrameHostCreationObserver() { 29 TestRenderFrameHostCreationObserver::~TestRenderFrameHostCreationObserver() {
30 } 30 }
31 31
32 void TestRenderFrameHostCreationObserver::RenderFrameCreated( 32 void TestRenderFrameHostCreationObserver::RenderFrameCreated(
33 RenderFrameHost* render_frame_host) { 33 RenderFrameHost* render_frame_host) {
34 last_created_frame_ = render_frame_host; 34 last_created_frame_ = render_frame_host;
35 } 35 }
36 36
37 TestRenderFrameHost::TestRenderFrameHost(RenderViewHostImpl* render_view_host, 37 TestRenderFrameHost::TestRenderFrameHost(RenderViewHostImpl* render_view_host,
38 RenderFrameHostDelegate* delegate, 38 RenderFrameHostDelegate* delegate,
39 RenderWidgetHostDelegate* rwh_delegate,
40 FrameTree* frame_tree, 39 FrameTree* frame_tree,
41 FrameTreeNode* frame_tree_node, 40 FrameTreeNode* frame_tree_node,
42 int routing_id, 41 int routing_id,
43 int flags) 42 int flags)
44 : RenderFrameHostImpl(render_view_host, 43 : RenderFrameHostImpl(render_view_host,
45 delegate, 44 delegate,
46 rwh_delegate,
47 frame_tree, 45 frame_tree,
48 frame_tree_node, 46 frame_tree_node,
49 routing_id, 47 routing_id,
50 flags), 48 flags),
51 child_creation_observer_(delegate ? delegate->GetAsWebContents() : NULL), 49 child_creation_observer_(delegate ? delegate->GetAsWebContents() : NULL),
52 contents_mime_type_("text/html"), 50 contents_mime_type_("text/html"),
53 simulate_history_list_was_cleared_(false) { 51 simulate_history_list_was_cleared_(false) {
54 } 52 }
55 53
56 TestRenderFrameHost::~TestRenderFrameHost() {} 54 TestRenderFrameHost::~TestRenderFrameHost() {}
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
233 231
234 ASSERT_TRUE(request->state() == NavigationRequest::STARTED); 232 ASSERT_TRUE(request->state() == NavigationRequest::STARTED);
235 TestNavigationURLLoader* url_loader = 233 TestNavigationURLLoader* url_loader =
236 static_cast<TestNavigationURLLoader*>(request->loader_for_testing()); 234 static_cast<TestNavigationURLLoader*>(request->loader_for_testing());
237 ASSERT_TRUE(url_loader); 235 ASSERT_TRUE(url_loader);
238 scoped_refptr<ResourceResponse> response(new ResourceResponse); 236 scoped_refptr<ResourceResponse> response(new ResourceResponse);
239 url_loader->CallOnResponseStarted(response, MakeEmptyStream()); 237 url_loader->CallOnResponseStarted(response, MakeEmptyStream());
240 } 238 }
241 239
242 } // namespace content 240 } // 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