OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "base/bind.h" | 5 #include "base/bind.h" |
6 #include "base/command_line.h" | 6 #include "base/command_line.h" |
7 #include "content/browser/loader/cross_site_resource_handler.h" | 7 #include "content/browser/loader/cross_site_resource_handler.h" |
8 #include "content/browser/loader/resource_dispatcher_host_impl.h" | 8 #include "content/browser/loader/resource_dispatcher_host_impl.h" |
9 #include "content/browser/loader/resource_request_info_impl.h" | 9 #include "content/browser/loader/resource_request_info_impl.h" |
10 #include "content/browser/transition_request_manager.h" | 10 #include "content/browser/transition_request_manager.h" |
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
58 appcache_service, | 58 appcache_service, |
59 resource_type, | 59 resource_type, |
60 throttles); | 60 throttles); |
61 request_ = request; | 61 request_ = request; |
62 | 62 |
63 ResourceRequestInfoImpl* info = | 63 ResourceRequestInfoImpl* info = |
64 ResourceRequestInfoImpl::ForRequest(request_); | 64 ResourceRequestInfoImpl::ForRequest(request_); |
65 | 65 |
66 if (is_transition_request_) { | 66 if (is_transition_request_) { |
67 TransitionRequestManager::GetInstance()->AddPendingTransitionRequestData( | 67 TransitionRequestManager::GetInstance()->AddPendingTransitionRequestData( |
68 info->GetChildID(), info->GetRenderFrameID(), "*", "", ""); | 68 info->GetChildID(), |
| 69 info->GetRenderFrameID(), |
| 70 std::vector<std::string>(), |
| 71 std::vector<std::string>(), |
| 72 std::vector<gfx::Rect>()); |
69 } | 73 } |
70 } | 74 } |
71 | 75 |
72 virtual void OnResponseStarted( | 76 virtual void OnResponseStarted( |
73 net::URLRequest* request, | 77 net::URLRequest* request, |
74 ResourceContext* resource_context, | 78 ResourceContext* resource_context, |
75 ResourceResponse* response, | 79 ResourceResponse* response, |
76 IPC::Sender* sender) override { | 80 IPC::Sender* sender) override { |
77 ResourceRequestInfoImpl* info = | 81 ResourceRequestInfoImpl* info = |
78 ResourceRequestInfoImpl::ForRequest(request_); | 82 ResourceRequestInfoImpl::ForRequest(request_); |
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
151 | 155 |
152 WaitForLoadStop(transition_web_contents.get()); | 156 WaitForLoadStop(transition_web_contents.get()); |
153 | 157 |
154 int transition_process_id = | 158 int transition_process_id = |
155 transition_web_contents->GetRenderProcessHost()->GetID(); | 159 transition_web_contents->GetRenderProcessHost()->GetID(); |
156 | 160 |
157 EXPECT_EQ(outgoing_process_id, transition_process_id); | 161 EXPECT_EQ(outgoing_process_id, transition_process_id); |
158 } | 162 } |
159 | 163 |
160 } // namespace content | 164 } // namespace content |
OLD | NEW |