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 <string> | 5 #include <string> |
6 #include <vector> | 6 #include <vector> |
7 | 7 |
8 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
9 #include "base/message_loop/message_loop.h" | 9 #include "base/message_loop/message_loop.h" |
10 #include "base/process/process.h" | 10 #include "base/process/process.h" |
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
169 request_info.first_party_for_cookies = GURL(test_page_url); | 169 request_info.first_party_for_cookies = GURL(test_page_url); |
170 request_info.referrer = GURL(); | 170 request_info.referrer = GURL(); |
171 request_info.headers = std::string(); | 171 request_info.headers = std::string(); |
172 request_info.load_flags = 0; | 172 request_info.load_flags = 0; |
173 request_info.requestor_pid = 0; | 173 request_info.requestor_pid = 0; |
174 request_info.request_type = ResourceType::SUB_RESOURCE; | 174 request_info.request_type = ResourceType::SUB_RESOURCE; |
175 request_info.appcache_host_id = appcache::kNoHostId; | 175 request_info.appcache_host_id = appcache::kNoHostId; |
176 request_info.routing_id = 0; | 176 request_info.routing_id = 0; |
177 RequestExtraData extra_data(WebKit::WebReferrerPolicyDefault, | 177 RequestExtraData extra_data(WebKit::WebReferrerPolicyDefault, |
178 WebKit::WebString(), | 178 WebKit::WebString(), |
179 false, true, 0, false, -1, true, | 179 false, true, 0, |
| 180 WebKit::WebString(), |
| 181 false, -1, true, |
180 PAGE_TRANSITION_LINK, -1, -1); | 182 PAGE_TRANSITION_LINK, -1, -1); |
181 request_info.extra_data = &extra_data; | 183 request_info.extra_data = &extra_data; |
182 | 184 |
183 return dispatcher_->CreateBridge(request_info); | 185 return dispatcher_->CreateBridge(request_info); |
184 } | 186 } |
185 | 187 |
186 std::vector<IPC::Message> message_queue_; | 188 std::vector<IPC::Message> message_queue_; |
187 static scoped_ptr<ResourceDispatcher> dispatcher_; | 189 static scoped_ptr<ResourceDispatcher> dispatcher_; |
188 }; | 190 }; |
189 | 191 |
(...skipping 243 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
433 response_head.error_code = net::OK; | 435 response_head.error_code = net::OK; |
434 | 436 |
435 PerformTest(response_head); | 437 PerformTest(response_head); |
436 | 438 |
437 EXPECT_EQ(base::TimeTicks(), response_info().load_timing.request_start); | 439 EXPECT_EQ(base::TimeTicks(), response_info().load_timing.request_start); |
438 EXPECT_EQ(base::TimeTicks(), | 440 EXPECT_EQ(base::TimeTicks(), |
439 response_info().load_timing.connect_timing.dns_start); | 441 response_info().load_timing.connect_timing.dns_start); |
440 } | 442 } |
441 | 443 |
442 } // namespace content | 444 } // namespace content |
OLD | NEW |