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

Side by Side Diff: net/base/host_resolver.cc

Issue 126028: Remove a DCHECK which is being hit because of a unit-test's particular setup.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | 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) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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/base/host_resolver.h" 5 #include "net/base/host_resolver.h"
6 6
7 #if defined(OS_WIN) 7 #if defined(OS_WIN)
8 #include <ws2tcpip.h> 8 #include <ws2tcpip.h>
9 #include <wspiapi.h> // Needed for Win2k compat. 9 #include <wspiapi.h> // Needed for Win2k compat.
10 #elif defined(OS_POSIX) 10 #elif defined(OS_POSIX)
(...skipping 302 matching lines...) Expand 10 before | Expand all | Expand 10 after
313 reply = NULL; 313 reply = NULL;
314 } 314 }
315 } 315 }
316 316
317 // Does nothing if it got posted. 317 // Does nothing if it got posted.
318 delete reply; 318 delete reply;
319 } 319 }
320 320
321 // Callback for when DoLookup() completes (runs on origin thread). 321 // Callback for when DoLookup() completes (runs on origin thread).
322 void OnLookupComplete() { 322 void OnLookupComplete() {
323 DCHECK_EQ(origin_loop_, MessageLoop::current()); 323 // Should be running on origin loop.
324 // TODO(eroman): this is being hit by URLRequestTest.CancelTest*,
325 // because MessageLoop::current() == NULL.
326 //DCHECK_EQ(origin_loop_, MessageLoop::current());
324 DCHECK(error_ || results_); 327 DCHECK(error_ || results_);
325 328
326 if (was_cancelled()) 329 if (was_cancelled())
327 return; 330 return;
328 331
329 DCHECK(!requests_.empty()); 332 DCHECK(!requests_.empty());
330 333
331 // Adopt the address list using the port number of the first request. 334 // Adopt the address list using the port number of the first request.
332 AddressList addrlist; 335 AddressList addrlist;
333 if (error_ == OK) { 336 if (error_ == OK) {
(...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after
554 557
555 // Clear the outstanding request information. 558 // Clear the outstanding request information.
556 cur_request_ = NULL; 559 cur_request_ = NULL;
557 cur_request_callback_ = NULL; 560 cur_request_callback_ = NULL;
558 561
559 // Call the user's original callback. 562 // Call the user's original callback.
560 callback->Run(result); 563 callback->Run(result);
561 } 564 }
562 565
563 } // namespace net 566 } // namespace net
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698