| 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/values.h" | 10 #include "base/values.h" |
| (...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 79 public: | 79 public: |
| 80 ProxyResolverV8TracingWrapper( | 80 ProxyResolverV8TracingWrapper( |
| 81 scoped_ptr<ProxyResolverV8Tracing> resolver_impl, | 81 scoped_ptr<ProxyResolverV8Tracing> resolver_impl, |
| 82 NetLog* net_log, | 82 NetLog* net_log, |
| 83 HostResolver* host_resolver, | 83 HostResolver* host_resolver, |
| 84 scoped_ptr<ProxyResolverErrorObserver> error_observer); | 84 scoped_ptr<ProxyResolverErrorObserver> error_observer); |
| 85 | 85 |
| 86 int GetProxyForURL(const GURL& url, | 86 int GetProxyForURL(const GURL& url, |
| 87 ProxyInfo* results, | 87 ProxyInfo* results, |
| 88 const CompletionCallback& callback, | 88 const CompletionCallback& callback, |
| 89 RequestHandle* request, | 89 scoped_ptr<Request>* request, |
| 90 const BoundNetLog& net_log) override; | 90 const BoundNetLog& net_log) override; |
| 91 | 91 |
| 92 void CancelRequest(RequestHandle request) override; | |
| 93 | |
| 94 LoadState GetLoadState(RequestHandle request) const override; | |
| 95 | |
| 96 private: | 92 private: |
| 97 scoped_ptr<ProxyResolverV8Tracing> resolver_impl_; | 93 scoped_ptr<ProxyResolverV8Tracing> resolver_impl_; |
| 98 NetLog* net_log_; | 94 NetLog* net_log_; |
| 99 HostResolver* host_resolver_; | 95 HostResolver* host_resolver_; |
| 100 scoped_ptr<ProxyResolverErrorObserver> error_observer_; | 96 scoped_ptr<ProxyResolverErrorObserver> error_observer_; |
| 101 | 97 |
| 102 DISALLOW_COPY_AND_ASSIGN(ProxyResolverV8TracingWrapper); | 98 DISALLOW_COPY_AND_ASSIGN(ProxyResolverV8TracingWrapper); |
| 103 }; | 99 }; |
| 104 | 100 |
| 105 ProxyResolverV8TracingWrapper::ProxyResolverV8TracingWrapper( | 101 ProxyResolverV8TracingWrapper::ProxyResolverV8TracingWrapper( |
| 106 scoped_ptr<ProxyResolverV8Tracing> resolver_impl, | 102 scoped_ptr<ProxyResolverV8Tracing> resolver_impl, |
| 107 NetLog* net_log, | 103 NetLog* net_log, |
| 108 HostResolver* host_resolver, | 104 HostResolver* host_resolver, |
| 109 scoped_ptr<ProxyResolverErrorObserver> error_observer) | 105 scoped_ptr<ProxyResolverErrorObserver> error_observer) |
| 110 : resolver_impl_(resolver_impl.Pass()), | 106 : resolver_impl_(resolver_impl.Pass()), |
| 111 net_log_(net_log), | 107 net_log_(net_log), |
| 112 host_resolver_(host_resolver), | 108 host_resolver_(host_resolver), |
| 113 error_observer_(error_observer.Pass()) { | 109 error_observer_(error_observer.Pass()) { |
| 114 } | 110 } |
| 115 | 111 |
| 116 int ProxyResolverV8TracingWrapper::GetProxyForURL( | 112 int ProxyResolverV8TracingWrapper::GetProxyForURL( |
| 117 const GURL& url, | 113 const GURL& url, |
| 118 ProxyInfo* results, | 114 ProxyInfo* results, |
| 119 const CompletionCallback& callback, | 115 const CompletionCallback& callback, |
| 120 RequestHandle* request, | 116 scoped_ptr<Request>* request, |
| 121 const BoundNetLog& net_log) { | 117 const BoundNetLog& net_log) { |
| 122 resolver_impl_->GetProxyForURL( | 118 resolver_impl_->GetProxyForURL( |
| 123 url, results, callback, request, | 119 url, results, callback, request, |
| 124 make_scoped_ptr(new BindingsImpl(error_observer_.get(), host_resolver_, | 120 make_scoped_ptr(new BindingsImpl(error_observer_.get(), host_resolver_, |
| 125 net_log_, net_log))); | 121 net_log_, net_log))); |
| 126 return ERR_IO_PENDING; | 122 return ERR_IO_PENDING; |
| 127 } | 123 } |
| 128 | 124 |
| 129 void ProxyResolverV8TracingWrapper::CancelRequest(RequestHandle request) { | |
| 130 resolver_impl_->CancelRequest(request); | |
| 131 } | |
| 132 | |
| 133 LoadState ProxyResolverV8TracingWrapper::GetLoadState( | |
| 134 RequestHandle request) const { | |
| 135 return resolver_impl_->GetLoadState(request); | |
| 136 } | |
| 137 | |
| 138 } // namespace | 125 } // namespace |
| 139 | 126 |
| 140 ProxyResolverFactoryV8TracingWrapper::ProxyResolverFactoryV8TracingWrapper( | 127 ProxyResolverFactoryV8TracingWrapper::ProxyResolverFactoryV8TracingWrapper( |
| 141 HostResolver* host_resolver, | 128 HostResolver* host_resolver, |
| 142 NetLog* net_log, | 129 NetLog* net_log, |
| 143 const base::Callback<scoped_ptr<ProxyResolverErrorObserver>()>& | 130 const base::Callback<scoped_ptr<ProxyResolverErrorObserver>()>& |
| 144 error_observer_factory) | 131 error_observer_factory) |
| 145 : ProxyResolverFactory(true), | 132 : ProxyResolverFactory(true), |
| 146 factory_impl_(ProxyResolverV8TracingFactory::Create()), | 133 factory_impl_(ProxyResolverV8TracingFactory::Create()), |
| 147 host_resolver_(host_resolver), | 134 host_resolver_(host_resolver), |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 184 scoped_ptr<ProxyResolverErrorObserver> error_observer, | 171 scoped_ptr<ProxyResolverErrorObserver> error_observer, |
| 185 int error) { | 172 int error) { |
| 186 if (error == OK) { | 173 if (error == OK) { |
| 187 resolver->reset(new ProxyResolverV8TracingWrapper( | 174 resolver->reset(new ProxyResolverV8TracingWrapper( |
| 188 v8_resolver->Pass(), net_log_, host_resolver_, error_observer.Pass())); | 175 v8_resolver->Pass(), net_log_, host_resolver_, error_observer.Pass())); |
| 189 } | 176 } |
| 190 callback.Run(error); | 177 callback.Run(error); |
| 191 } | 178 } |
| 192 | 179 |
| 193 } // namespace net | 180 } // namespace net |
| OLD | NEW |