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 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
11 #include "base/macros.h" | 11 #include "base/macros.h" |
12 #include "base/memory/ptr_util.h" | 12 #include "base/memory/ptr_util.h" |
13 #include "base/values.h" | 13 #include "base/values.h" |
14 #include "net/base/net_errors.h" | 14 #include "net/base/net_errors.h" |
15 #include "net/log/net_log.h" | 15 #include "net/log/net_log.h" |
| 16 #include "net/log/net_log_capture_mode.h" |
16 #include "net/log/net_log_event_type.h" | 17 #include "net/log/net_log_event_type.h" |
| 18 #include "net/log/net_log_parameters_callback.h" |
| 19 #include "net/log/net_log_with_source.h" |
17 #include "net/proxy/proxy_resolver_error_observer.h" | 20 #include "net/proxy/proxy_resolver_error_observer.h" |
18 | 21 |
19 namespace net { | 22 namespace net { |
| 23 |
20 namespace { | 24 namespace { |
21 | 25 |
22 // Returns event parameters for a PAC error message (line number + message). | 26 // Returns event parameters for a PAC error message (line number + message). |
23 std::unique_ptr<base::Value> NetLogErrorCallback( | 27 std::unique_ptr<base::Value> NetLogErrorCallback( |
24 int line_number, | 28 int line_number, |
25 const base::string16* message, | 29 const base::string16* message, |
26 NetLogCaptureMode /* capture_mode */) { | 30 NetLogCaptureMode /* capture_mode */) { |
27 std::unique_ptr<base::DictionaryValue> dict(new base::DictionaryValue()); | 31 std::unique_ptr<base::DictionaryValue> dict(new base::DictionaryValue()); |
28 dict->SetInteger("line_number", line_number); | 32 dict->SetInteger("line_number", line_number); |
29 dict->SetString("message", *message); | 33 dict->SetString("message", *message); |
(...skipping 30 matching lines...) Expand all Loading... |
60 | 64 |
61 HostResolver* GetHostResolver() override { return host_resolver_; } | 65 HostResolver* GetHostResolver() override { return host_resolver_; } |
62 | 66 |
63 NetLogWithSource GetNetLogWithSource() override { | 67 NetLogWithSource GetNetLogWithSource() override { |
64 return net_log_with_source_; | 68 return net_log_with_source_; |
65 } | 69 } |
66 | 70 |
67 private: | 71 private: |
68 void LogEventToCurrentRequestAndGlobally( | 72 void LogEventToCurrentRequestAndGlobally( |
69 NetLogEventType type, | 73 NetLogEventType type, |
70 const NetLog::ParametersCallback& parameters_callback) { | 74 const NetLogParametersCallback& parameters_callback) { |
71 net_log_with_source_.AddEvent(type, parameters_callback); | 75 net_log_with_source_.AddEvent(type, parameters_callback); |
72 | 76 |
73 // Emit to the global NetLog event stream. | 77 // Emit to the global NetLog event stream. |
74 if (net_log_) | 78 if (net_log_) |
75 net_log_->AddGlobalEntry(type, parameters_callback); | 79 net_log_->AddGlobalEntry(type, parameters_callback); |
76 } | 80 } |
77 | 81 |
78 ProxyResolverErrorObserver* error_observer_; | 82 ProxyResolverErrorObserver* error_observer_; |
79 HostResolver* host_resolver_; | 83 HostResolver* host_resolver_; |
80 NetLog* net_log_; | 84 NetLog* net_log_; |
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
190 int error) { | 194 int error) { |
191 if (error == OK) { | 195 if (error == OK) { |
192 resolver->reset(new ProxyResolverV8TracingWrapper( | 196 resolver->reset(new ProxyResolverV8TracingWrapper( |
193 std::move(*v8_resolver), net_log_, host_resolver_, | 197 std::move(*v8_resolver), net_log_, host_resolver_, |
194 std::move(error_observer))); | 198 std::move(error_observer))); |
195 } | 199 } |
196 callback.Run(error); | 200 callback.Run(error); |
197 } | 201 } |
198 | 202 |
199 } // namespace net | 203 } // namespace net |
OLD | NEW |