OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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_wrapper.h" | 5 #include "net/proxy/proxy_resolver_v8_tracing_wrapper.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/macros.h" |
10 #include "base/values.h" | 11 #include "base/values.h" |
11 #include "net/base/net_errors.h" | 12 #include "net/base/net_errors.h" |
12 #include "net/log/net_log.h" | 13 #include "net/log/net_log.h" |
13 #include "net/proxy/proxy_resolver_error_observer.h" | 14 #include "net/proxy/proxy_resolver_error_observer.h" |
14 | 15 |
15 namespace net { | 16 namespace net { |
16 namespace { | 17 namespace { |
17 | 18 |
18 // Returns event parameters for a PAC error message (line number + message). | 19 // Returns event parameters for a PAC error message (line number + message). |
19 scoped_ptr<base::Value> NetLogErrorCallback( | 20 scoped_ptr<base::Value> NetLogErrorCallback( |
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
184 scoped_ptr<ProxyResolverErrorObserver> error_observer, | 185 scoped_ptr<ProxyResolverErrorObserver> error_observer, |
185 int error) { | 186 int error) { |
186 if (error == OK) { | 187 if (error == OK) { |
187 resolver->reset(new ProxyResolverV8TracingWrapper( | 188 resolver->reset(new ProxyResolverV8TracingWrapper( |
188 v8_resolver->Pass(), net_log_, host_resolver_, error_observer.Pass())); | 189 v8_resolver->Pass(), net_log_, host_resolver_, error_observer.Pass())); |
189 } | 190 } |
190 callback.Run(error); | 191 callback.Run(error); |
191 } | 192 } |
192 | 193 |
193 } // namespace net | 194 } // namespace net |
OLD | NEW |