OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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.h" | 5 #include "content/test/test_render_frame.h" |
6 | 6 |
7 #include "base/memory/ptr_util.h" | 7 #include "base/memory/ptr_util.h" |
| 8 #include "content/common/frame_messages.h" |
8 #include "content/common/navigation_params.h" | 9 #include "content/common/navigation_params.h" |
9 #include "content/common/resource_request_body_impl.h" | 10 #include "content/common/resource_request_body_impl.h" |
10 #include "content/public/common/associated_interface_provider.h" | 11 #include "content/public/common/associated_interface_provider.h" |
11 #include "content/public/common/browser_side_navigation_policy.h" | 12 #include "content/public/common/browser_side_navigation_policy.h" |
12 #include "content/public/common/resource_response.h" | 13 #include "content/public/common/resource_response.h" |
13 #include "content/public/test/mock_render_thread.h" | 14 #include "content/public/test/mock_render_thread.h" |
14 #include "third_party/WebKit/public/web/WebLocalFrame.h" | 15 #include "third_party/WebKit/public/web/WebLocalFrame.h" |
15 | 16 |
16 namespace content { | 17 namespace content { |
17 | 18 |
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
57 | 58 |
58 TestRenderFrame::~TestRenderFrame() { | 59 TestRenderFrame::~TestRenderFrame() { |
59 } | 60 } |
60 | 61 |
61 void TestRenderFrame::Navigate(const CommonNavigationParams& common_params, | 62 void TestRenderFrame::Navigate(const CommonNavigationParams& common_params, |
62 const StartNavigationParams& start_params, | 63 const StartNavigationParams& start_params, |
63 const RequestNavigationParams& request_params) { | 64 const RequestNavigationParams& request_params) { |
64 // PlzNavigate | 65 // PlzNavigate |
65 if (IsBrowserSideNavigationEnabled()) { | 66 if (IsBrowserSideNavigationEnabled()) { |
66 OnCommitNavigation(ResourceResponseHead(), GURL(), | 67 OnCommitNavigation(ResourceResponseHead(), GURL(), |
67 mojo::DataPipeConsumerHandle(), common_params, | 68 FrameMsg_CommitDataNetworkService_Params(), |
68 request_params); | 69 common_params, request_params); |
69 } else { | 70 } else { |
70 OnNavigate(common_params, start_params, request_params); | 71 OnNavigate(common_params, start_params, request_params); |
71 } | 72 } |
72 } | 73 } |
73 | 74 |
74 void TestRenderFrame::SwapOut( | 75 void TestRenderFrame::SwapOut( |
75 int proxy_routing_id, | 76 int proxy_routing_id, |
76 bool is_loading, | 77 bool is_loading, |
77 const FrameReplicationState& replicated_frame_state) { | 78 const FrameReplicationState& replicated_frame_state) { |
78 OnSwapOut(proxy_routing_id, is_loading, replicated_frame_state); | 79 OnSwapOut(proxy_routing_id, is_loading, replicated_frame_state); |
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
124 | 125 |
125 mojom::FrameHostAssociatedPtr TestRenderFrame::GetFrameHost() { | 126 mojom::FrameHostAssociatedPtr TestRenderFrame::GetFrameHost() { |
126 mojom::FrameHostAssociatedPtr ptr = RenderFrameImpl::GetFrameHost(); | 127 mojom::FrameHostAssociatedPtr ptr = RenderFrameImpl::GetFrameHost(); |
127 | 128 |
128 // Needed to ensure no deadlocks when waiting for sync IPC. | 129 // Needed to ensure no deadlocks when waiting for sync IPC. |
129 ptr.FlushForTesting(); | 130 ptr.FlushForTesting(); |
130 return ptr; | 131 return ptr; |
131 } | 132 } |
132 | 133 |
133 } // namespace content | 134 } // namespace content |
OLD | NEW |