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

Side by Side Diff: net/proxy/proxy_resolver_v8_tracing.cc

Issue 12518036: net: move host_resolver files from net/base to net/dns (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 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
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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/proxy/proxy_resolver_v8_tracing.h" 5 #include "net/proxy/proxy_resolver_v8_tracing.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/message_loop_proxy.h" 8 #include "base/message_loop_proxy.h"
9 #include "base/metrics/histogram.h" 9 #include "base/metrics/histogram.h"
10 #include "base/stringprintf.h" 10 #include "base/stringprintf.h"
11 #include "base/synchronization/cancellation_flag.h" 11 #include "base/synchronization/cancellation_flag.h"
12 #include "base/synchronization/waitable_event.h" 12 #include "base/synchronization/waitable_event.h"
13 #include "base/threading/thread.h" 13 #include "base/threading/thread.h"
14 #include "base/threading/thread_restrictions.h" 14 #include "base/threading/thread_restrictions.h"
15 #include "base/values.h" 15 #include "base/values.h"
16 #include "net/base/address_list.h" 16 #include "net/base/address_list.h"
17 #include "net/base/host_resolver.h"
18 #include "net/base/net_errors.h" 17 #include "net/base/net_errors.h"
19 #include "net/base/net_log.h" 18 #include "net/base/net_log.h"
19 #include "net/dns/host_resolver.h"
20 #include "net/proxy/proxy_info.h" 20 #include "net/proxy/proxy_info.h"
21 #include "net/proxy/proxy_resolver_error_observer.h" 21 #include "net/proxy/proxy_resolver_error_observer.h"
22 #include "net/proxy/proxy_resolver_v8.h" 22 #include "net/proxy/proxy_resolver_v8.h"
23 23
24 // The intent of this class is explained in the design document: 24 // The intent of this class is explained in the design document:
25 // https://docs.google.com/a/chromium.org/document/d/16Ij5OcVnR3s0MH4Z5XkhI9VTPo MJdaBn9rKreAmGOdE/edit 25 // https://docs.google.com/a/chromium.org/document/d/16Ij5OcVnR3s0MH4Z5XkhI9VTPo MJdaBn9rKreAmGOdE/edit
26 // 26 //
27 // In a nutshell, PAC scripts are Javascript programs and may depend on 27 // In a nutshell, PAC scripts are Javascript programs and may depend on
28 // network I/O, by calling functions like dnsResolve(). 28 // network I/O, by calling functions like dnsResolve().
29 // 29 //
(...skipping 1111 matching lines...) Expand 10 before | Expand all | Expand 10 after
1141 DCHECK(!set_pac_script_job_); 1141 DCHECK(!set_pac_script_job_);
1142 CHECK_EQ(0, num_outstanding_callbacks_); 1142 CHECK_EQ(0, num_outstanding_callbacks_);
1143 1143
1144 set_pac_script_job_ = new Job(this); 1144 set_pac_script_job_ = new Job(this);
1145 set_pac_script_job_->StartSetPacScript(script_data, callback); 1145 set_pac_script_job_->StartSetPacScript(script_data, callback);
1146 1146
1147 return ERR_IO_PENDING; 1147 return ERR_IO_PENDING;
1148 } 1148 }
1149 1149
1150 } // namespace net 1150 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698