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

Side by Side Diff: net/url_request/url_request_test_util.cc

Issue 8743019: base::Bind: Convert net::NetworkDelegate. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Review fixes. Created 9 years 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 | Annotate | Revision Log
« no previous file with comments | « net/url_request/url_request_test_util.h ('k') | net/url_request/url_request_unittest.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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "net/url_request/url_request_test_util.h" 5 #include "net/url_request/url_request_test_util.h"
6 6
7 #include "base/compiler_specific.h" 7 #include "base/compiler_specific.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/message_loop.h" 9 #include "base/message_loop.h"
10 #include "base/threading/thread.h" 10 #include "base/threading/thread.h"
(...skipping 321 matching lines...) Expand 10 before | Expand all | Expand 10 after
332 332
333 void TestNetworkDelegate::InitRequestStatesIfNew(int request_id) { 333 void TestNetworkDelegate::InitRequestStatesIfNew(int request_id) {
334 if (next_states_.find(request_id) == next_states_.end()) { 334 if (next_states_.find(request_id) == next_states_.end()) {
335 next_states_[request_id] = kStageBeforeURLRequest; 335 next_states_[request_id] = kStageBeforeURLRequest;
336 event_order_[request_id] = ""; 336 event_order_[request_id] = "";
337 } 337 }
338 } 338 }
339 339
340 int TestNetworkDelegate::OnBeforeURLRequest( 340 int TestNetworkDelegate::OnBeforeURLRequest(
341 net::URLRequest* request, 341 net::URLRequest* request,
342 net::OldCompletionCallback* callback, 342 const net::CompletionCallback& callback,
343 GURL* new_url ) { 343 GURL* new_url ) {
344 int req_id = request->identifier(); 344 int req_id = request->identifier();
345 InitRequestStatesIfNew(req_id); 345 InitRequestStatesIfNew(req_id);
346 event_order_[req_id] += "OnBeforeURLRequest\n"; 346 event_order_[req_id] += "OnBeforeURLRequest\n";
347 EXPECT_TRUE(next_states_[req_id] & kStageBeforeURLRequest) << 347 EXPECT_TRUE(next_states_[req_id] & kStageBeforeURLRequest) <<
348 event_order_[req_id]; 348 event_order_[req_id];
349 next_states_[req_id] = 349 next_states_[req_id] =
350 kStageBeforeSendHeaders | 350 kStageBeforeSendHeaders |
351 kStageResponseStarted | // data: URLs do not trigger sending headers 351 kStageResponseStarted | // data: URLs do not trigger sending headers
352 kStageBeforeRedirect | // a delegate can trigger a redirection 352 kStageBeforeRedirect | // a delegate can trigger a redirection
353 kStageCompletedError | // request canceled by delegate 353 kStageCompletedError | // request canceled by delegate
354 kStageAuthRequired; // Auth can come next for FTP requests 354 kStageAuthRequired; // Auth can come next for FTP requests
355 created_requests_++; 355 created_requests_++;
356 return net::OK; 356 return net::OK;
357 } 357 }
358 358
359 int TestNetworkDelegate::OnBeforeSendHeaders( 359 int TestNetworkDelegate::OnBeforeSendHeaders(
360 net::URLRequest* request, 360 net::URLRequest* request,
361 net::OldCompletionCallback* callback, 361 const net::CompletionCallback& callback,
362 net::HttpRequestHeaders* headers) { 362 net::HttpRequestHeaders* headers) {
363 int req_id = request->identifier(); 363 int req_id = request->identifier();
364 InitRequestStatesIfNew(req_id); 364 InitRequestStatesIfNew(req_id);
365 event_order_[req_id] += "OnBeforeSendHeaders\n"; 365 event_order_[req_id] += "OnBeforeSendHeaders\n";
366 EXPECT_TRUE(next_states_[req_id] & kStageBeforeSendHeaders) << 366 EXPECT_TRUE(next_states_[req_id] & kStageBeforeSendHeaders) <<
367 event_order_[req_id]; 367 event_order_[req_id];
368 next_states_[req_id] = 368 next_states_[req_id] =
369 kStageSendHeaders | 369 kStageSendHeaders |
370 kStageCompletedError; // request canceled by delegate 370 kStageCompletedError; // request canceled by delegate
371 371
372 return net::OK; 372 return net::OK;
373 } 373 }
374 374
375 void TestNetworkDelegate::OnSendHeaders( 375 void TestNetworkDelegate::OnSendHeaders(
376 net::URLRequest* request, 376 net::URLRequest* request,
377 const net::HttpRequestHeaders& headers) { 377 const net::HttpRequestHeaders& headers) {
378 int req_id = request->identifier(); 378 int req_id = request->identifier();
379 InitRequestStatesIfNew(req_id); 379 InitRequestStatesIfNew(req_id);
380 event_order_[req_id] += "OnSendHeaders\n"; 380 event_order_[req_id] += "OnSendHeaders\n";
381 EXPECT_TRUE(next_states_[req_id] & kStageSendHeaders) << 381 EXPECT_TRUE(next_states_[req_id] & kStageSendHeaders) <<
382 event_order_[req_id]; 382 event_order_[req_id];
383 next_states_[req_id] = 383 next_states_[req_id] =
384 kStageHeadersReceived | 384 kStageHeadersReceived |
385 kStageCompletedError; 385 kStageCompletedError;
386 } 386 }
387 387
388 int TestNetworkDelegate::OnHeadersReceived( 388 int TestNetworkDelegate::OnHeadersReceived(
389 net::URLRequest* request, 389 net::URLRequest* request,
390 net::OldCompletionCallback* callback, 390 const net::CompletionCallback& callback,
391 net::HttpResponseHeaders* original_response_headers, 391 net::HttpResponseHeaders* original_response_headers,
392 scoped_refptr<net::HttpResponseHeaders>* override_response_headers) { 392 scoped_refptr<net::HttpResponseHeaders>* override_response_headers) {
393 int req_id = request->identifier(); 393 int req_id = request->identifier();
394 event_order_[req_id] += "OnHeadersReceived\n"; 394 event_order_[req_id] += "OnHeadersReceived\n";
395 InitRequestStatesIfNew(req_id); 395 InitRequestStatesIfNew(req_id);
396 EXPECT_TRUE(next_states_[req_id] & kStageHeadersReceived) << 396 EXPECT_TRUE(next_states_[req_id] & kStageHeadersReceived) <<
397 event_order_[req_id]; 397 event_order_[req_id];
398 next_states_[req_id] = 398 next_states_[req_id] =
399 kStageBeforeRedirect | 399 kStageBeforeRedirect |
400 kStageResponseStarted | 400 kStageResponseStarted |
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
489 event_order_[req_id] += "OnAuthRequired\n"; 489 event_order_[req_id] += "OnAuthRequired\n";
490 EXPECT_TRUE(next_states_[req_id] & kStageAuthRequired) << 490 EXPECT_TRUE(next_states_[req_id] & kStageAuthRequired) <<
491 event_order_[req_id]; 491 event_order_[req_id];
492 next_states_[req_id] = kStageBeforeSendHeaders | 492 next_states_[req_id] = kStageBeforeSendHeaders |
493 kStageHeadersReceived | // Request canceled by delegate simulates empty 493 kStageHeadersReceived | // Request canceled by delegate simulates empty
494 // response. 494 // response.
495 kStageResponseStarted | // data: URLs do not trigger sending headers 495 kStageResponseStarted | // data: URLs do not trigger sending headers
496 kStageBeforeRedirect; // a delegate can trigger a redirection 496 kStageBeforeRedirect; // a delegate can trigger a redirection
497 return net::NetworkDelegate::AUTH_REQUIRED_RESPONSE_NO_ACTION; 497 return net::NetworkDelegate::AUTH_REQUIRED_RESPONSE_NO_ACTION;
498 } 498 }
OLDNEW
« no previous file with comments | « net/url_request/url_request_test_util.h ('k') | net/url_request/url_request_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698