OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/public/test/render_view_fake_resources_test.h" | 5 #include "content/public/test/render_view_fake_resources_test.h" |
6 | 6 |
7 #include <string.h> | 7 #include <string.h> |
8 | 8 |
9 #include "base/process.h" | 9 #include "base/process.h" |
10 #include "base/shared_memory.h" | 10 #include "base/shared_memory.h" |
11 #include "base/time.h" | 11 #include "base/time.h" |
12 #include "content/common/resource_messages.h" | 12 #include "content/common/resource_messages.h" |
13 #include "content/common/view_messages.h" | 13 #include "content/common/view_messages.h" |
14 #include "content/public/common/resource_response.h" | 14 #include "content/public/common/resource_response.h" |
15 #include "content/renderer/render_thread_impl.h" | 15 #include "content/renderer/render_thread_impl.h" |
16 #include "content/renderer/render_view_impl.h" | 16 #include "content/renderer/render_view_impl.h" |
17 #include "content/renderer/renderer_webkitplatformsupport_impl.h" | 17 #include "content/renderer/renderer_webkitplatformsupport_impl.h" |
18 #include "content/test/mock_render_process.h" | 18 #include "content/test/mock_render_process.h" |
19 #include "googleurl/src/gurl.h" | 19 #include "googleurl/src/gurl.h" |
| 20 #include "net/base/net_errors.h" |
20 #include "net/base/upload_data.h" | 21 #include "net/base/upload_data.h" |
21 #include "net/http/http_response_headers.h" | 22 #include "net/http/http_response_headers.h" |
22 #include "net/url_request/url_request_status.h" | 23 #include "net/url_request/url_request_status.h" |
23 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" | 24 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" |
24 #include "third_party/WebKit/Source/WebKit/chromium/public/WebHistoryItem.h" | 25 #include "third_party/WebKit/Source/WebKit/chromium/public/WebHistoryItem.h" |
25 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" | 26 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" |
26 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLReques
t.h" | 27 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLReques
t.h" |
27 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" | 28 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" |
28 #include "webkit/dom_storage/dom_storage_types.h" | 29 #include "webkit/dom_storage/dom_storage_types.h" |
29 #include "webkit/glue/glue_serialize.h" | 30 #include "webkit/glue/glue_serialize.h" |
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
170 ASSERT_TRUE(channel_->Send(new ResourceMsg_DataReceived( | 171 ASSERT_TRUE(channel_->Send(new ResourceMsg_DataReceived( |
171 message.routing_id(), | 172 message.routing_id(), |
172 request_id, | 173 request_id, |
173 handle, | 174 handle, |
174 body.size(), | 175 body.size(), |
175 body.size()))); | 176 body.size()))); |
176 | 177 |
177 ASSERT_TRUE(channel_->Send(new ResourceMsg_RequestComplete( | 178 ASSERT_TRUE(channel_->Send(new ResourceMsg_RequestComplete( |
178 message.routing_id(), | 179 message.routing_id(), |
179 request_id, | 180 request_id, |
180 net::URLRequestStatus(), | 181 net::OK, |
| 182 false, |
181 std::string(), | 183 std::string(), |
182 base::TimeTicks()))); | 184 base::TimeTicks()))); |
183 } | 185 } |
184 | 186 |
185 void RenderViewFakeResourcesTest::OnRenderViewReady() { | 187 void RenderViewFakeResourcesTest::OnRenderViewReady() { |
186 // Grab a pointer to the new view using RenderViewVisitor. | 188 // Grab a pointer to the new view using RenderViewVisitor. |
187 ASSERT_TRUE(!view_); | 189 ASSERT_TRUE(!view_); |
188 RenderView::ForEach(this); | 190 RenderView::ForEach(this); |
189 ASSERT_TRUE(view_); | 191 ASSERT_TRUE(view_); |
190 message_loop_.Quit(); | 192 message_loop_.Quit(); |
(...skipping 13 matching lines...) Expand all Loading... |
204 params.url = GURL(history_item.urlString()); | 206 params.url = GURL(history_item.urlString()); |
205 params.transition = PAGE_TRANSITION_FORWARD_BACK; | 207 params.transition = PAGE_TRANSITION_FORWARD_BACK; |
206 params.state = webkit_glue::HistoryItemToString(history_item); | 208 params.state = webkit_glue::HistoryItemToString(history_item); |
207 params.navigation_type = ViewMsg_Navigate_Type::NORMAL; | 209 params.navigation_type = ViewMsg_Navigate_Type::NORMAL; |
208 params.request_time = base::Time::Now(); | 210 params.request_time = base::Time::Now(); |
209 channel_->Send(new ViewMsg_Navigate(impl->routing_id(), params)); | 211 channel_->Send(new ViewMsg_Navigate(impl->routing_id(), params)); |
210 message_loop_.Run(); | 212 message_loop_.Run(); |
211 } | 213 } |
212 | 214 |
213 } // namespace content | 215 } // namespace content |
OLD | NEW |