| 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 "chrome/browser/net/resolve_proxy_msg_helper.h" | 5 #include "chrome/browser/net/resolve_proxy_msg_helper.h" |
| 6 | 6 |
| 7 #include "base/waitable_event.h" | 7 #include "base/waitable_event.h" |
| 8 #include "net/base/net_errors.h" | 8 #include "net/base/net_errors.h" |
| 9 #include "net/proxy/proxy_config_service.h" | 9 #include "net/proxy/proxy_config_service.h" |
| 10 #include "net/proxy/proxy_resolver.h" | 10 #include "net/proxy/proxy_resolver.h" |
| (...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 205 AsyncRequestRunner* async_runner_; | 205 AsyncRequestRunner* async_runner_; |
| 206 }; | 206 }; |
| 207 | 207 |
| 208 // Avoid the need to have an AddRef / Release | 208 // Avoid the need to have an AddRef / Release |
| 209 template<> | 209 template<> |
| 210 void RunnableMethodTraits<RunnerBridge>::RetainCallee(RunnerBridge*) {} | 210 void RunnableMethodTraits<RunnerBridge>::RetainCallee(RunnerBridge*) {} |
| 211 template<> | 211 template<> |
| 212 void RunnableMethodTraits<RunnerBridge>::ReleaseCallee(RunnerBridge*) {} | 212 void RunnableMethodTraits<RunnerBridge>::ReleaseCallee(RunnerBridge*) {} |
| 213 | 213 |
| 214 template<> | 214 template<> |
| 215 void RunnableMethodTraits<AsyncRequestRunner>::RetainCallee(AsyncRequestRunner*)
{} | 215 void RunnableMethodTraits<AsyncRequestRunner>::RetainCallee( |
| 216 AsyncRequestRunner*) {} |
| 216 template<> | 217 template<> |
| 217 void RunnableMethodTraits<AsyncRequestRunner>::ReleaseCallee(AsyncRequestRunner*
) {} | 218 void RunnableMethodTraits<AsyncRequestRunner>::ReleaseCallee( |
| 219 AsyncRequestRunner*) {} |
| 218 | 220 |
| 219 | 221 |
| 220 // Issue three sequential requests -- each should succeed. | 222 // Issue three sequential requests -- each should succeed. |
| 221 TEST(ResolveProxyMsgHelperTest, Sequential) { | 223 TEST(ResolveProxyMsgHelperTest, Sequential) { |
| 222 RunnerBridge runner; | 224 RunnerBridge runner; |
| 223 | 225 |
| 224 GURL url1("http://www.google1.com/"); | 226 GURL url1("http://www.google1.com/"); |
| 225 GURL url2("http://www.google2.com/"); | 227 GURL url2("http://www.google2.com/"); |
| 226 GURL url3("http://www.google3.com/"); | 228 GURL url3("http://www.google3.com/"); |
| 227 | 229 |
| (...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 343 result1->TimedWaitUntilDone(base::TimeDelta::FromMilliseconds(2))); | 345 result1->TimedWaitUntilDone(base::TimeDelta::FromMilliseconds(2))); |
| 344 EXPECT_FALSE( | 346 EXPECT_FALSE( |
| 345 result2->TimedWaitUntilDone(base::TimeDelta::FromMilliseconds(2))); | 347 result2->TimedWaitUntilDone(base::TimeDelta::FromMilliseconds(2))); |
| 346 EXPECT_FALSE( | 348 EXPECT_FALSE( |
| 347 result3->TimedWaitUntilDone(base::TimeDelta::FromMilliseconds(2))); | 349 result3->TimedWaitUntilDone(base::TimeDelta::FromMilliseconds(2))); |
| 348 | 350 |
| 349 // It should also be the case that msg1, msg2, msg3 were deleted by the | 351 // It should also be the case that msg1, msg2, msg3 were deleted by the |
| 350 // cancellation. (Else will show up as a leak in Purify). | 352 // cancellation. (Else will show up as a leak in Purify). |
| 351 } | 353 } |
| 352 | 354 |
| OLD | NEW |