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

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

Issue 1439053002: Change ProxyResolver::GetProxyForURL() to take a scoped_ptr<Request>* rather than a RequestHandle* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Restore scoped_ptr to mock and nits Created 4 years, 10 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
OLDNEW
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"
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 public: 81 public:
82 ProxyResolverV8TracingWrapper( 82 ProxyResolverV8TracingWrapper(
83 scoped_ptr<ProxyResolverV8Tracing> resolver_impl, 83 scoped_ptr<ProxyResolverV8Tracing> resolver_impl,
84 NetLog* net_log, 84 NetLog* net_log,
85 HostResolver* host_resolver, 85 HostResolver* host_resolver,
86 scoped_ptr<ProxyResolverErrorObserver> error_observer); 86 scoped_ptr<ProxyResolverErrorObserver> error_observer);
87 87
88 int GetProxyForURL(const GURL& url, 88 int GetProxyForURL(const GURL& url,
89 ProxyInfo* results, 89 ProxyInfo* results,
90 const CompletionCallback& callback, 90 const CompletionCallback& callback,
91 RequestHandle* request, 91 scoped_ptr<Request>* request,
92 const BoundNetLog& net_log) override; 92 const BoundNetLog& net_log) override;
93 93
94 void CancelRequest(RequestHandle request) override;
95
96 LoadState GetLoadState(RequestHandle request) const override;
97
98 private: 94 private:
99 scoped_ptr<ProxyResolverV8Tracing> resolver_impl_; 95 scoped_ptr<ProxyResolverV8Tracing> resolver_impl_;
100 NetLog* net_log_; 96 NetLog* net_log_;
101 HostResolver* host_resolver_; 97 HostResolver* host_resolver_;
102 scoped_ptr<ProxyResolverErrorObserver> error_observer_; 98 scoped_ptr<ProxyResolverErrorObserver> error_observer_;
103 99
104 DISALLOW_COPY_AND_ASSIGN(ProxyResolverV8TracingWrapper); 100 DISALLOW_COPY_AND_ASSIGN(ProxyResolverV8TracingWrapper);
105 }; 101 };
106 102
107 ProxyResolverV8TracingWrapper::ProxyResolverV8TracingWrapper( 103 ProxyResolverV8TracingWrapper::ProxyResolverV8TracingWrapper(
108 scoped_ptr<ProxyResolverV8Tracing> resolver_impl, 104 scoped_ptr<ProxyResolverV8Tracing> resolver_impl,
109 NetLog* net_log, 105 NetLog* net_log,
110 HostResolver* host_resolver, 106 HostResolver* host_resolver,
111 scoped_ptr<ProxyResolverErrorObserver> error_observer) 107 scoped_ptr<ProxyResolverErrorObserver> error_observer)
112 : resolver_impl_(std::move(resolver_impl)), 108 : resolver_impl_(std::move(resolver_impl)),
113 net_log_(net_log), 109 net_log_(net_log),
114 host_resolver_(host_resolver), 110 host_resolver_(host_resolver),
115 error_observer_(std::move(error_observer)) {} 111 error_observer_(std::move(error_observer)) {}
116 112
117 int ProxyResolverV8TracingWrapper::GetProxyForURL( 113 int ProxyResolverV8TracingWrapper::GetProxyForURL(
118 const GURL& url, 114 const GURL& url,
119 ProxyInfo* results, 115 ProxyInfo* results,
120 const CompletionCallback& callback, 116 const CompletionCallback& callback,
121 RequestHandle* request, 117 scoped_ptr<Request>* request,
122 const BoundNetLog& net_log) { 118 const BoundNetLog& net_log) {
123 resolver_impl_->GetProxyForURL( 119 resolver_impl_->GetProxyForURL(
124 url, results, callback, request, 120 url, results, callback, request,
125 make_scoped_ptr(new BindingsImpl(error_observer_.get(), host_resolver_, 121 make_scoped_ptr(new BindingsImpl(error_observer_.get(), host_resolver_,
126 net_log_, net_log))); 122 net_log_, net_log)));
127 return ERR_IO_PENDING; 123 return ERR_IO_PENDING;
128 } 124 }
129 125
130 void ProxyResolverV8TracingWrapper::CancelRequest(RequestHandle request) {
131 resolver_impl_->CancelRequest(request);
132 }
133
134 LoadState ProxyResolverV8TracingWrapper::GetLoadState(
135 RequestHandle request) const {
136 return resolver_impl_->GetLoadState(request);
137 }
138
139 } // namespace 126 } // namespace
140 127
141 ProxyResolverFactoryV8TracingWrapper::ProxyResolverFactoryV8TracingWrapper( 128 ProxyResolverFactoryV8TracingWrapper::ProxyResolverFactoryV8TracingWrapper(
142 HostResolver* host_resolver, 129 HostResolver* host_resolver,
143 NetLog* net_log, 130 NetLog* net_log,
144 const base::Callback<scoped_ptr<ProxyResolverErrorObserver>()>& 131 const base::Callback<scoped_ptr<ProxyResolverErrorObserver>()>&
145 error_observer_factory) 132 error_observer_factory)
146 : ProxyResolverFactory(true), 133 : ProxyResolverFactory(true),
147 factory_impl_(ProxyResolverV8TracingFactory::Create()), 134 factory_impl_(ProxyResolverV8TracingFactory::Create()),
148 host_resolver_(host_resolver), 135 host_resolver_(host_resolver),
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 int error) { 173 int error) {
187 if (error == OK) { 174 if (error == OK) {
188 resolver->reset(new ProxyResolverV8TracingWrapper( 175 resolver->reset(new ProxyResolverV8TracingWrapper(
189 std::move(*v8_resolver), net_log_, host_resolver_, 176 std::move(*v8_resolver), net_log_, host_resolver_,
190 std::move(error_observer))); 177 std::move(error_observer)));
191 } 178 }
192 callback.Run(error); 179 callback.Run(error);
193 } 180 }
194 181
195 } // namespace net 182 } // namespace net
OLDNEW
« no previous file with comments | « net/proxy/proxy_resolver_v8_tracing_unittest.cc ('k') | net/proxy/proxy_resolver_v8_tracing_wrapper_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698