| OLD | NEW |
| 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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/multi_threaded_proxy_resolver.h" | 5 #include "net/proxy/multi_threaded_proxy_resolver.h" |
| 6 | 6 |
| 7 #include "base/stl_util-inl.h" | 7 #include "base/stl_util-inl.h" |
| 8 #include "base/string_util.h" | 8 #include "base/string_util.h" |
| 9 #include "base/stringprintf.h" | 9 #include "base/stringprintf.h" |
| 10 #include "base/utf_string_conversions.h" | 10 #include "base/utf_string_conversions.h" |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 53 results->UseNamedProxy(query_url.host()); | 53 results->UseNamedProxy(query_url.host()); |
| 54 | 54 |
| 55 // Return a success code which represents the request's order. | 55 // Return a success code which represents the request's order. |
| 56 return request_count_++; | 56 return request_count_++; |
| 57 } | 57 } |
| 58 | 58 |
| 59 virtual void CancelRequest(RequestHandle request) { | 59 virtual void CancelRequest(RequestHandle request) { |
| 60 NOTREACHED(); | 60 NOTREACHED(); |
| 61 } | 61 } |
| 62 | 62 |
| 63 virtual void CancelSetPacScript() { |
| 64 NOTREACHED(); |
| 65 } |
| 66 |
| 63 virtual int SetPacScript( | 67 virtual int SetPacScript( |
| 64 const scoped_refptr<ProxyResolverScriptData>& script_data, | 68 const scoped_refptr<ProxyResolverScriptData>& script_data, |
| 65 CompletionCallback* callback) { | 69 CompletionCallback* callback) { |
| 66 CheckIsOnWorkerThread(); | 70 CheckIsOnWorkerThread(); |
| 67 last_script_data_ = script_data; | 71 last_script_data_ = script_data; |
| 68 return OK; | 72 return OK; |
| 69 } | 73 } |
| 70 | 74 |
| 71 virtual void PurgeMemory() { | 75 virtual void PurgeMemory() { |
| 72 CheckIsOnWorkerThread(); | 76 CheckIsOnWorkerThread(); |
| (...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 162 RequestHandle* request, | 166 RequestHandle* request, |
| 163 const BoundNetLog& net_log) { | 167 const BoundNetLog& net_log) { |
| 164 return impl_->GetProxyForURL( | 168 return impl_->GetProxyForURL( |
| 165 query_url, results, callback, request, net_log); | 169 query_url, results, callback, request, net_log); |
| 166 } | 170 } |
| 167 | 171 |
| 168 virtual void CancelRequest(RequestHandle request) { | 172 virtual void CancelRequest(RequestHandle request) { |
| 169 impl_->CancelRequest(request); | 173 impl_->CancelRequest(request); |
| 170 } | 174 } |
| 171 | 175 |
| 176 virtual void CancelSetPacScript() { |
| 177 impl_->CancelSetPacScript(); |
| 178 } |
| 179 |
| 172 virtual int SetPacScript( | 180 virtual int SetPacScript( |
| 173 const scoped_refptr<ProxyResolverScriptData>& script_data, | 181 const scoped_refptr<ProxyResolverScriptData>& script_data, |
| 174 CompletionCallback* callback) { | 182 CompletionCallback* callback) { |
| 175 return impl_->SetPacScript(script_data, callback); | 183 return impl_->SetPacScript(script_data, callback); |
| 176 } | 184 } |
| 177 | 185 |
| 178 virtual void PurgeMemory() { | 186 virtual void PurgeMemory() { |
| 179 impl_->PurgeMemory(); | 187 impl_->PurgeMemory(); |
| 180 } | 188 } |
| 181 | 189 |
| (...skipping 576 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 758 // All in all, the first thread should have seen just 1 request. And the | 766 // All in all, the first thread should have seen just 1 request. And the |
| 759 // second thread 3 requests. | 767 // second thread 3 requests. |
| 760 ASSERT_EQ(2u, factory->resolvers().size()); | 768 ASSERT_EQ(2u, factory->resolvers().size()); |
| 761 EXPECT_EQ(1, factory->resolvers()[0]->request_count()); | 769 EXPECT_EQ(1, factory->resolvers()[0]->request_count()); |
| 762 EXPECT_EQ(3, factory->resolvers()[1]->request_count()); | 770 EXPECT_EQ(3, factory->resolvers()[1]->request_count()); |
| 763 } | 771 } |
| 764 | 772 |
| 765 } // namespace | 773 } // namespace |
| 766 | 774 |
| 767 } // namespace net | 775 } // namespace net |
| OLD | NEW |