OLD | NEW |
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 16 matching lines...) Expand all Loading... |
27 } | 27 } |
28 | 28 |
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(SiteInstance* site_instance, |
| 38 RenderViewHostImpl* render_view_host, |
38 RenderFrameHostDelegate* delegate, | 39 RenderFrameHostDelegate* delegate, |
39 RenderWidgetHostDelegate* rwh_delegate, | 40 RenderWidgetHostDelegate* rwh_delegate, |
40 FrameTree* frame_tree, | 41 FrameTree* frame_tree, |
41 FrameTreeNode* frame_tree_node, | 42 FrameTreeNode* frame_tree_node, |
42 int routing_id, | 43 int routing_id, |
43 int flags) | 44 int flags) |
44 : RenderFrameHostImpl(render_view_host, | 45 : RenderFrameHostImpl(site_instance, |
| 46 render_view_host, |
45 delegate, | 47 delegate, |
46 rwh_delegate, | 48 rwh_delegate, |
47 frame_tree, | 49 frame_tree, |
48 frame_tree_node, | 50 frame_tree_node, |
49 routing_id, | 51 routing_id, |
50 flags), | 52 flags), |
51 child_creation_observer_(delegate ? delegate->GetAsWebContents() : NULL), | 53 child_creation_observer_(delegate ? delegate->GetAsWebContents() : NULL), |
52 contents_mime_type_("text/html"), | 54 contents_mime_type_("text/html"), |
53 simulate_history_list_was_cleared_(false) { | 55 simulate_history_list_was_cleared_(false) { |
54 } | 56 } |
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
233 | 235 |
234 ASSERT_TRUE(request->state() == NavigationRequest::STARTED); | 236 ASSERT_TRUE(request->state() == NavigationRequest::STARTED); |
235 TestNavigationURLLoader* url_loader = | 237 TestNavigationURLLoader* url_loader = |
236 static_cast<TestNavigationURLLoader*>(request->loader_for_testing()); | 238 static_cast<TestNavigationURLLoader*>(request->loader_for_testing()); |
237 ASSERT_TRUE(url_loader); | 239 ASSERT_TRUE(url_loader); |
238 scoped_refptr<ResourceResponse> response(new ResourceResponse); | 240 scoped_refptr<ResourceResponse> response(new ResourceResponse); |
239 url_loader->CallOnResponseStarted(response, MakeEmptyStream()); | 241 url_loader->CallOnResponseStarted(response, MakeEmptyStream()); |
240 } | 242 } |
241 | 243 |
242 } // namespace content | 244 } // namespace content |
OLD | NEW |