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

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

Issue 2982009: Revert everything related to the relanding. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: Created 10 years, 5 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 | « net/base/file_stream_win.cc ('k') | net/base/listen_socket_unittest.h » ('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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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_impl.h" 5 #include "net/base/host_resolver_impl.h"
6 6
7 #if defined(OS_WIN) 7 #if defined(OS_WIN)
8 #include <Winsock2.h> 8 #include <Winsock2.h>
9 #elif defined(OS_POSIX) 9 #elif defined(OS_POSIX)
10 #include <netdb.h> 10 #include <netdb.h>
11 #endif 11 #endif
12 12
13 #include <cmath> 13 #include <cmath>
14 #include <deque> 14 #include <deque>
15 #include <vector> 15 #include <vector>
16 16
17 #include "base/basictypes.h" 17 #include "base/basictypes.h"
18 #include "base/compiler_specific.h" 18 #include "base/compiler_specific.h"
19 #include "base/debug_util.h" 19 #include "base/debug_util.h"
20 #include "base/histogram.h"
21 #include "base/lock.h" 20 #include "base/lock.h"
22 #include "base/message_loop.h" 21 #include "base/message_loop.h"
23 #include "base/stl_util-inl.h" 22 #include "base/stl_util-inl.h"
24 #include "base/string_util.h" 23 #include "base/string_util.h"
25 #include "base/time.h" 24 #include "base/time.h"
26 #include "base/values.h" 25 #include "base/values.h"
27 #include "base/worker_pool.h" 26 #include "base/worker_pool.h"
28 #include "net/base/address_list.h" 27 #include "net/base/address_list.h"
29 #include "net/base/host_resolver_proc.h" 28 #include "net/base/host_resolver_proc.h"
30 #include "net/base/net_log.h" 29 #include "net/base/net_log.h"
(...skipping 1118 matching lines...) Expand 10 before | Expand all | Expand 10 after
1149 if (r == req) 1148 if (r == req)
1150 return error; 1149 return error;
1151 1150
1152 r->OnComplete(error, AddressList()); 1151 r->OnComplete(error, AddressList());
1153 } 1152 }
1154 1153
1155 return ERR_IO_PENDING; 1154 return ERR_IO_PENDING;
1156 } 1155 }
1157 1156
1158 } // namespace net 1157 } // namespace net
OLDNEW
« no previous file with comments | « net/base/file_stream_win.cc ('k') | net/base/listen_socket_unittest.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698