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_factory_mojo.h" | 5 #include "net/proxy/proxy_resolver_factory_mojo.h" |
6 | 6 |
7 #include <set> | 7 #include <set> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
11 #include "base/callback.h" | 11 #include "base/callback.h" |
12 #include "base/logging.h" | 12 #include "base/logging.h" |
13 #include "base/macros.h" | 13 #include "base/macros.h" |
14 #include "base/stl_util.h" | 14 #include "base/stl_util.h" |
15 #include "base/threading/thread_checker.h" | 15 #include "base/threading/thread_checker.h" |
16 #include "base/values.h" | 16 #include "base/values.h" |
17 #include "mojo/common/common_type_converters.h" | 17 #include "mojo/common/common_type_converters.h" |
18 #include "mojo/public/cpp/bindings/binding.h" | 18 #include "mojo/public/cpp/bindings/binding.h" |
19 #include "net/base/load_states.h" | 19 #include "net/base/load_states.h" |
20 #include "net/base/net_errors.h" | 20 #include "net/base/net_errors.h" |
21 #include "net/dns/mojo_host_resolver_impl.h" | 21 #include "net/dns/mojo_host_resolver_impl.h" |
22 #include "net/interfaces/host_resolver_service.mojom.h" | 22 #include "net/interfaces/host_resolver_service.mojom.h" |
23 #include "net/interfaces/proxy_resolver_service.mojom.h" | 23 #include "net/interfaces/proxy_resolver_service.mojom.h" |
| 24 #include "net/log/net_log.h" |
| 25 #include "net/log/net_log_capture_mode.h" |
24 #include "net/log/net_log_event_type.h" | 26 #include "net/log/net_log_event_type.h" |
| 27 #include "net/log/net_log_with_source.h" |
25 #include "net/proxy/mojo_proxy_resolver_factory.h" | 28 #include "net/proxy/mojo_proxy_resolver_factory.h" |
26 #include "net/proxy/mojo_proxy_type_converters.h" | 29 #include "net/proxy/mojo_proxy_type_converters.h" |
27 #include "net/proxy/proxy_info.h" | 30 #include "net/proxy/proxy_info.h" |
28 #include "net/proxy/proxy_resolver.h" | 31 #include "net/proxy/proxy_resolver.h" |
29 #include "net/proxy/proxy_resolver_error_observer.h" | 32 #include "net/proxy/proxy_resolver_error_observer.h" |
30 #include "net/proxy/proxy_resolver_script_data.h" | 33 #include "net/proxy/proxy_resolver_script_data.h" |
31 | 34 |
32 namespace net { | 35 namespace net { |
| 36 |
33 namespace { | 37 namespace { |
34 | 38 |
35 std::unique_ptr<base::Value> NetLogErrorCallback( | 39 std::unique_ptr<base::Value> NetLogErrorCallback( |
36 int line_number, | 40 int line_number, |
37 const base::string16* message, | 41 const base::string16* message, |
38 NetLogCaptureMode /* capture_mode */) { | 42 NetLogCaptureMode /* capture_mode */) { |
39 std::unique_ptr<base::DictionaryValue> dict(new base::DictionaryValue()); | 43 std::unique_ptr<base::DictionaryValue> dict(new base::DictionaryValue()); |
40 dict->SetInteger("line_number", line_number); | 44 dict->SetInteger("line_number", line_number); |
41 dict->SetString("message", *message); | 45 dict->SetString("message", *message); |
42 return std::move(dict); | 46 return std::move(dict); |
(...skipping 360 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
403 return ERR_PAC_SCRIPT_FAILED; | 407 return ERR_PAC_SCRIPT_FAILED; |
404 } | 408 } |
405 request->reset(new Job(this, pac_script, resolver, callback, | 409 request->reset(new Job(this, pac_script, resolver, callback, |
406 error_observer_factory_.is_null() | 410 error_observer_factory_.is_null() |
407 ? nullptr | 411 ? nullptr |
408 : error_observer_factory_.Run())); | 412 : error_observer_factory_.Run())); |
409 return ERR_IO_PENDING; | 413 return ERR_IO_PENDING; |
410 } | 414 } |
411 | 415 |
412 } // namespace net | 416 } // namespace net |
OLD | NEW |