| Index: net/proxy/mock_proxy_resolver.cc
|
| diff --git a/net/proxy/mock_proxy_resolver.cc b/net/proxy/mock_proxy_resolver.cc
|
| index fb4a914ccbd17bce22487b0953af64e65f6f5596..e15f356ae199646b7faa478dae29677953dbf199 100644
|
| --- a/net/proxy/mock_proxy_resolver.cc
|
| +++ b/net/proxy/mock_proxy_resolver.cc
|
| @@ -18,18 +18,20 @@ MockAsyncProxyResolverBase::Request::Request(
|
| url_(url),
|
| results_(results),
|
| callback_(callback),
|
| - origin_loop_(base::MessageLoop::current()) {}
|
| + origin_loop_(base::MessageLoop::current()) {
|
| +}
|
|
|
| - void MockAsyncProxyResolverBase::Request::CompleteNow(int rv) {
|
| - CompletionCallback callback = callback_;
|
| +void MockAsyncProxyResolverBase::Request::CompleteNow(int rv) {
|
| + CompletionCallback callback = callback_;
|
|
|
| - // May delete |this|.
|
| - resolver_->RemovePendingRequest(this);
|
| + // May delete |this|.
|
| + resolver_->RemovePendingRequest(this);
|
|
|
| - callback.Run(rv);
|
| - }
|
| + callback.Run(rv);
|
| +}
|
|
|
| -MockAsyncProxyResolverBase::Request::~Request() {}
|
| +MockAsyncProxyResolverBase::Request::~Request() {
|
| +}
|
|
|
| MockAsyncProxyResolverBase::SetPacScriptRequest::SetPacScriptRequest(
|
| MockAsyncProxyResolverBase* resolver,
|
| @@ -38,24 +40,30 @@ MockAsyncProxyResolverBase::SetPacScriptRequest::SetPacScriptRequest(
|
| : resolver_(resolver),
|
| script_data_(script_data),
|
| callback_(callback),
|
| - origin_loop_(base::MessageLoop::current()) {}
|
| + origin_loop_(base::MessageLoop::current()) {
|
| +}
|
|
|
| -MockAsyncProxyResolverBase::SetPacScriptRequest::~SetPacScriptRequest() {}
|
| +MockAsyncProxyResolverBase::SetPacScriptRequest::~SetPacScriptRequest() {
|
| +}
|
|
|
| - void MockAsyncProxyResolverBase::SetPacScriptRequest::CompleteNow(int rv) {
|
| - CompletionCallback callback = callback_;
|
| +void MockAsyncProxyResolverBase::SetPacScriptRequest::CompleteNow(int rv) {
|
| + CompletionCallback callback = callback_;
|
|
|
| - // Will delete |this|.
|
| - resolver_->RemovePendingSetPacScriptRequest(this);
|
| + // Will delete |this|.
|
| + resolver_->RemovePendingSetPacScriptRequest(this);
|
|
|
| - callback.Run(rv);
|
| - }
|
| + callback.Run(rv);
|
| +}
|
|
|
| -MockAsyncProxyResolverBase::~MockAsyncProxyResolverBase() {}
|
| +MockAsyncProxyResolverBase::~MockAsyncProxyResolverBase() {
|
| +}
|
|
|
| int MockAsyncProxyResolverBase::GetProxyForURL(
|
| - const GURL& url, ProxyInfo* results, const CompletionCallback& callback,
|
| - RequestHandle* request_handle, const BoundNetLog& /*net_log*/) {
|
| + const GURL& url,
|
| + ProxyInfo* results,
|
| + const CompletionCallback& callback,
|
| + RequestHandle* request_handle,
|
| + const BoundNetLog& /*net_log*/) {
|
| scoped_refptr<Request> request = new Request(this, url, results, callback);
|
| pending_requests_.push_back(request);
|
|
|
| @@ -97,8 +105,8 @@ MockAsyncProxyResolverBase::pending_set_pac_script_request() const {
|
| }
|
|
|
| void MockAsyncProxyResolverBase::RemovePendingRequest(Request* request) {
|
| - RequestsList::iterator it = std::find(
|
| - pending_requests_.begin(), pending_requests_.end(), request);
|
| + RequestsList::iterator it =
|
| + std::find(pending_requests_.begin(), pending_requests_.end(), request);
|
| DCHECK(it != pending_requests_.end());
|
| pending_requests_.erase(it);
|
| }
|
| @@ -110,6 +118,7 @@ void MockAsyncProxyResolverBase::RemovePendingSetPacScriptRequest(
|
| }
|
|
|
| MockAsyncProxyResolverBase::MockAsyncProxyResolverBase(bool expects_pac_bytes)
|
| - : ProxyResolver(expects_pac_bytes) {}
|
| + : ProxyResolver(expects_pac_bytes) {
|
| +}
|
|
|
| } // namespace net
|
|
|