Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(841)

Side by Side Diff: content/child/resource_dispatcher_unittest.cc

Issue 1159553007: Move Tuple to base namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « content/child/fileapi/webfilesystem_impl.cc ('k') | content/child/threaded_data_provider.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/macros.h" 8 #include "base/macros.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/memory/shared_memory.h" 10 #include "base/memory/shared_memory.h"
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 ADD_FAILURE() << "Missing resource request message"; 179 ADD_FAILURE() << "Missing resource request message";
180 return -1; 180 return -1;
181 } 181 }
182 182
183 ResourceHostMsg_RequestResource::Param params; 183 ResourceHostMsg_RequestResource::Param params;
184 if (ResourceHostMsg_RequestResource::ID != message_queue_[0].type() || 184 if (ResourceHostMsg_RequestResource::ID != message_queue_[0].type() ||
185 !ResourceHostMsg_RequestResource::Read(&message_queue_[0], &params)) { 185 !ResourceHostMsg_RequestResource::Read(&message_queue_[0], &params)) {
186 ADD_FAILURE() << "Expected ResourceHostMsg_RequestResource message"; 186 ADD_FAILURE() << "Expected ResourceHostMsg_RequestResource message";
187 return -1; 187 return -1;
188 } 188 }
189 ResourceHostMsg_Request request = get<2>(params); 189 ResourceHostMsg_Request request = base::get<2>(params);
190 EXPECT_EQ(kTestPageUrl, request.url.spec()); 190 EXPECT_EQ(kTestPageUrl, request.url.spec());
191 message_queue_.erase(message_queue_.begin()); 191 message_queue_.erase(message_queue_.begin());
192 return get<1>(params); 192 return base::get<1>(params);
193 } 193 }
194 194
195 void ConsumeFollowRedirect(int expected_request_id) { 195 void ConsumeFollowRedirect(int expected_request_id) {
196 ASSERT_FALSE(message_queue_.empty()); 196 ASSERT_FALSE(message_queue_.empty());
197 Tuple<int> args; 197 base::Tuple<int> args;
198 ASSERT_EQ(ResourceHostMsg_FollowRedirect::ID, message_queue_[0].type()); 198 ASSERT_EQ(ResourceHostMsg_FollowRedirect::ID, message_queue_[0].type());
199 ASSERT_TRUE(ResourceHostMsg_FollowRedirect::Read( 199 ASSERT_TRUE(ResourceHostMsg_FollowRedirect::Read(
200 &message_queue_[0], &args)); 200 &message_queue_[0], &args));
201 EXPECT_EQ(expected_request_id, get<0>(args)); 201 EXPECT_EQ(expected_request_id, base::get<0>(args));
202 message_queue_.erase(message_queue_.begin()); 202 message_queue_.erase(message_queue_.begin());
203 } 203 }
204 204
205 void ConsumeDataReceived_ACK(int expected_request_id) { 205 void ConsumeDataReceived_ACK(int expected_request_id) {
206 ASSERT_FALSE(message_queue_.empty()); 206 ASSERT_FALSE(message_queue_.empty());
207 Tuple<int> args; 207 base::Tuple<int> args;
208 ASSERT_EQ(ResourceHostMsg_DataReceived_ACK::ID, message_queue_[0].type()); 208 ASSERT_EQ(ResourceHostMsg_DataReceived_ACK::ID, message_queue_[0].type());
209 ASSERT_TRUE(ResourceHostMsg_DataReceived_ACK::Read( 209 ASSERT_TRUE(ResourceHostMsg_DataReceived_ACK::Read(
210 &message_queue_[0], &args)); 210 &message_queue_[0], &args));
211 EXPECT_EQ(expected_request_id, get<0>(args)); 211 EXPECT_EQ(expected_request_id, base::get<0>(args));
212 message_queue_.erase(message_queue_.begin()); 212 message_queue_.erase(message_queue_.begin());
213 } 213 }
214 214
215 void ConsumeDataDownloaded_ACK(int expected_request_id) { 215 void ConsumeDataDownloaded_ACK(int expected_request_id) {
216 ASSERT_FALSE(message_queue_.empty()); 216 ASSERT_FALSE(message_queue_.empty());
217 Tuple<int> args; 217 base::Tuple<int> args;
218 ASSERT_EQ(ResourceHostMsg_DataDownloaded_ACK::ID, message_queue_[0].type()); 218 ASSERT_EQ(ResourceHostMsg_DataDownloaded_ACK::ID, message_queue_[0].type());
219 ASSERT_TRUE(ResourceHostMsg_DataDownloaded_ACK::Read( 219 ASSERT_TRUE(ResourceHostMsg_DataDownloaded_ACK::Read(
220 &message_queue_[0], &args)); 220 &message_queue_[0], &args));
221 EXPECT_EQ(expected_request_id, get<0>(args)); 221 EXPECT_EQ(expected_request_id, base::get<0>(args));
222 message_queue_.erase(message_queue_.begin()); 222 message_queue_.erase(message_queue_.begin());
223 } 223 }
224 224
225 void ConsumeReleaseDownloadedFile(int expected_request_id) { 225 void ConsumeReleaseDownloadedFile(int expected_request_id) {
226 ASSERT_FALSE(message_queue_.empty()); 226 ASSERT_FALSE(message_queue_.empty());
227 Tuple<int> args; 227 base::Tuple<int> args;
228 ASSERT_EQ(ResourceHostMsg_ReleaseDownloadedFile::ID, 228 ASSERT_EQ(ResourceHostMsg_ReleaseDownloadedFile::ID,
229 message_queue_[0].type()); 229 message_queue_[0].type());
230 ASSERT_TRUE(ResourceHostMsg_ReleaseDownloadedFile::Read( 230 ASSERT_TRUE(ResourceHostMsg_ReleaseDownloadedFile::Read(
231 &message_queue_[0], &args)); 231 &message_queue_[0], &args));
232 EXPECT_EQ(expected_request_id, get<0>(args)); 232 EXPECT_EQ(expected_request_id, base::get<0>(args));
233 message_queue_.erase(message_queue_.begin()); 233 message_queue_.erase(message_queue_.begin());
234 } 234 }
235 235
236 void ConsumeCancelRequest(int expected_request_id) { 236 void ConsumeCancelRequest(int expected_request_id) {
237 ASSERT_FALSE(message_queue_.empty()); 237 ASSERT_FALSE(message_queue_.empty());
238 Tuple<int> args; 238 base::Tuple<int> args;
239 ASSERT_EQ(ResourceHostMsg_CancelRequest::ID, message_queue_[0].type()); 239 ASSERT_EQ(ResourceHostMsg_CancelRequest::ID, message_queue_[0].type());
240 ASSERT_TRUE(ResourceHostMsg_CancelRequest::Read( 240 ASSERT_TRUE(ResourceHostMsg_CancelRequest::Read(
241 &message_queue_[0], &args)); 241 &message_queue_[0], &args));
242 EXPECT_EQ(expected_request_id, get<0>(args)); 242 EXPECT_EQ(expected_request_id, base::get<0>(args));
243 message_queue_.erase(message_queue_.begin()); 243 message_queue_.erase(message_queue_.begin());
244 } 244 }
245 245
246 void NotifyReceivedRedirect(int request_id) { 246 void NotifyReceivedRedirect(int request_id) {
247 ResourceResponseHead head; 247 ResourceResponseHead head;
248 std::string raw_headers(kTestRedirectHeaders); 248 std::string raw_headers(kTestRedirectHeaders);
249 std::replace(raw_headers.begin(), raw_headers.end(), '\n', '\0'); 249 std::replace(raw_headers.begin(), raw_headers.end(), '\n', '\0');
250 head.headers = new net::HttpResponseHeaders(raw_headers); 250 head.headers = new net::HttpResponseHeaders(raw_headers);
251 net::RedirectInfo redirect_info; 251 net::RedirectInfo redirect_info;
252 redirect_info.status_code = 302; 252 redirect_info.status_code = 302;
(...skipping 534 matching lines...) Expand 10 before | Expand all | Expand 10 after
787 ResourceResponseHead response_head; 787 ResourceResponseHead response_head;
788 788
789 PerformTest(response_head); 789 PerformTest(response_head);
790 790
791 EXPECT_EQ(base::TimeTicks(), response_info().load_timing.request_start); 791 EXPECT_EQ(base::TimeTicks(), response_info().load_timing.request_start);
792 EXPECT_EQ(base::TimeTicks(), 792 EXPECT_EQ(base::TimeTicks(),
793 response_info().load_timing.connect_timing.dns_start); 793 response_info().load_timing.connect_timing.dns_start);
794 } 794 }
795 795
796 } // namespace content 796 } // namespace content
OLDNEW
« no previous file with comments | « content/child/fileapi/webfilesystem_impl.cc ('k') | content/child/threaded_data_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698