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

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

Issue 616133002: Make RenderFrame(Host) own a RenderWidget(Host). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Re-applying same patch 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
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,
39 FrameTree* frame_tree, 40 FrameTree* frame_tree,
40 FrameTreeNode* frame_tree_node, 41 FrameTreeNode* frame_tree_node,
41 int routing_id, 42 int routing_id,
42 int flags) 43 int flags)
43 : RenderFrameHostImpl(render_view_host, 44 : RenderFrameHostImpl(render_view_host,
44 delegate, 45 delegate,
46 rwh_delegate,
45 frame_tree, 47 frame_tree,
46 frame_tree_node, 48 frame_tree_node,
47 routing_id, 49 routing_id,
48 flags), 50 flags),
49 child_creation_observer_(delegate ? delegate->GetAsWebContents() : NULL), 51 child_creation_observer_(delegate ? delegate->GetAsWebContents() : NULL),
50 contents_mime_type_("text/html"), 52 contents_mime_type_("text/html"),
51 simulate_history_list_was_cleared_(false) { 53 simulate_history_list_was_cleared_(false) {
52 } 54 }
53 55
54 TestRenderFrameHost::~TestRenderFrameHost() {} 56 TestRenderFrameHost::~TestRenderFrameHost() {}
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
231 233
232 ASSERT_TRUE(request->state() == NavigationRequest::STARTED); 234 ASSERT_TRUE(request->state() == NavigationRequest::STARTED);
233 TestNavigationURLLoader* url_loader = 235 TestNavigationURLLoader* url_loader =
234 static_cast<TestNavigationURLLoader*>(request->loader_for_testing()); 236 static_cast<TestNavigationURLLoader*>(request->loader_for_testing());
235 ASSERT_TRUE(url_loader); 237 ASSERT_TRUE(url_loader);
236 scoped_refptr<ResourceResponse> response(new ResourceResponse); 238 scoped_refptr<ResourceResponse> response(new ResourceResponse);
237 url_loader->CallOnResponseStarted(response, MakeEmptyStream()); 239 url_loader->CallOnResponseStarted(response, MakeEmptyStream());
238 } 240 }
239 241
240 } // namespace content 242 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698