| 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_factory_mojo.h" | 5 #include "net/proxy/proxy_resolver_factory_mojo.h" |
| 6 | 6 |
| 7 #include <list> | 7 #include <list> |
| 8 #include <map> | 8 #include <map> |
| 9 #include <memory> | 9 #include <memory> |
| 10 #include <queue> | 10 #include <queue> |
| (...skipping 472 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 483 enum Event { | 483 enum Event { |
| 484 DNS_REQUEST, | 484 DNS_REQUEST, |
| 485 }; | 485 }; |
| 486 | 486 |
| 487 // HostResolver overrides. | 487 // HostResolver overrides. |
| 488 int Resolve(const RequestInfo& info, | 488 int Resolve(const RequestInfo& info, |
| 489 RequestPriority priority, | 489 RequestPriority priority, |
| 490 AddressList* addresses, | 490 AddressList* addresses, |
| 491 const CompletionCallback& callback, | 491 const CompletionCallback& callback, |
| 492 std::unique_ptr<Request>* request, | 492 std::unique_ptr<Request>* request, |
| 493 const BoundNetLog& source_net_log) override { | 493 const NetLogWithSource& source_net_log) override { |
| 494 waiter_.NotifyEvent(DNS_REQUEST); | 494 waiter_.NotifyEvent(DNS_REQUEST); |
| 495 return ERR_IO_PENDING; | 495 return ERR_IO_PENDING; |
| 496 } | 496 } |
| 497 | 497 |
| 498 int ResolveFromCache(const RequestInfo& info, | 498 int ResolveFromCache(const RequestInfo& info, |
| 499 AddressList* addresses, | 499 AddressList* addresses, |
| 500 const BoundNetLog& source_net_log) override { | 500 const NetLogWithSource& source_net_log) override { |
| 501 return ERR_DNS_CACHE_MISS; | 501 return ERR_DNS_CACHE_MISS; |
| 502 } | 502 } |
| 503 | 503 |
| 504 HostCache* GetHostCache() override { return nullptr; } | 504 HostCache* GetHostCache() override { return nullptr; } |
| 505 | 505 |
| 506 EventWaiter<Event>& waiter() { return waiter_; } | 506 EventWaiter<Event>& waiter() { return waiter_; } |
| 507 | 507 |
| 508 private: | 508 private: |
| 509 EventWaiter<Event> waiter_; | 509 EventWaiter<Event> waiter_; |
| 510 }; | 510 }; |
| (...skipping 347 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 858 } | 858 } |
| 859 | 859 |
| 860 TEST_F(ProxyResolverFactoryMojoTest, GetProxyForURL_DeleteInCallback) { | 860 TEST_F(ProxyResolverFactoryMojoTest, GetProxyForURL_DeleteInCallback) { |
| 861 mock_proxy_resolver_.AddGetProxyAction(GetProxyForUrlAction::ReturnServers( | 861 mock_proxy_resolver_.AddGetProxyAction(GetProxyForUrlAction::ReturnServers( |
| 862 GURL(kExampleUrl), ProxyServersFromPacString("DIRECT"))); | 862 GURL(kExampleUrl), ProxyServersFromPacString("DIRECT"))); |
| 863 CreateProxyResolver(); | 863 CreateProxyResolver(); |
| 864 | 864 |
| 865 ProxyInfo results; | 865 ProxyInfo results; |
| 866 TestCompletionCallback callback; | 866 TestCompletionCallback callback; |
| 867 ProxyResolver::RequestHandle handle; | 867 ProxyResolver::RequestHandle handle; |
| 868 BoundNetLog net_log; | 868 NetLogWithSource net_log; |
| 869 EXPECT_EQ( | 869 EXPECT_EQ( |
| 870 OK, | 870 OK, |
| 871 callback.GetResult(proxy_resolver_mojo_->GetProxyForURL( | 871 callback.GetResult(proxy_resolver_mojo_->GetProxyForURL( |
| 872 GURL(kExampleUrl), &results, | 872 GURL(kExampleUrl), &results, |
| 873 base::Bind(&ProxyResolverFactoryMojoTest::DeleteProxyResolverCallback, | 873 base::Bind(&ProxyResolverFactoryMojoTest::DeleteProxyResolverCallback, |
| 874 base::Unretained(this), callback.callback()), | 874 base::Unretained(this), callback.callback()), |
| 875 &handle, net_log))); | 875 &handle, net_log))); |
| 876 on_delete_callback_.WaitForResult(); | 876 on_delete_callback_.WaitForResult(); |
| 877 } | 877 } |
| 878 | 878 |
| 879 TEST_F(ProxyResolverFactoryMojoTest, | 879 TEST_F(ProxyResolverFactoryMojoTest, |
| 880 GetProxyForURL_DeleteInCallbackFromDisconnect) { | 880 GetProxyForURL_DeleteInCallbackFromDisconnect) { |
| 881 mock_proxy_resolver_.AddGetProxyAction( | 881 mock_proxy_resolver_.AddGetProxyAction( |
| 882 GetProxyForUrlAction::Disconnect(GURL(kExampleUrl))); | 882 GetProxyForUrlAction::Disconnect(GURL(kExampleUrl))); |
| 883 CreateProxyResolver(); | 883 CreateProxyResolver(); |
| 884 | 884 |
| 885 ProxyInfo results; | 885 ProxyInfo results; |
| 886 TestCompletionCallback callback; | 886 TestCompletionCallback callback; |
| 887 ProxyResolver::RequestHandle handle; | 887 ProxyResolver::RequestHandle handle; |
| 888 BoundNetLog net_log; | 888 NetLogWithSource net_log; |
| 889 EXPECT_EQ( | 889 EXPECT_EQ( |
| 890 ERR_PAC_SCRIPT_TERMINATED, | 890 ERR_PAC_SCRIPT_TERMINATED, |
| 891 callback.GetResult(proxy_resolver_mojo_->GetProxyForURL( | 891 callback.GetResult(proxy_resolver_mojo_->GetProxyForURL( |
| 892 GURL(kExampleUrl), &results, | 892 GURL(kExampleUrl), &results, |
| 893 base::Bind(&ProxyResolverFactoryMojoTest::DeleteProxyResolverCallback, | 893 base::Bind(&ProxyResolverFactoryMojoTest::DeleteProxyResolverCallback, |
| 894 base::Unretained(this), callback.callback()), | 894 base::Unretained(this), callback.callback()), |
| 895 &handle, net_log))); | 895 &handle, net_log))); |
| 896 on_delete_callback_.WaitForResult(); | 896 on_delete_callback_.WaitForResult(); |
| 897 } | 897 } |
| 898 | 898 |
| (...skipping 11 matching lines...) Expand all Loading... |
| 910 mock_proxy_resolver_.ClearBlockedClients(); | 910 mock_proxy_resolver_.ClearBlockedClients(); |
| 911 request->WaitForResult(); | 911 request->WaitForResult(); |
| 912 } | 912 } |
| 913 | 913 |
| 914 TEST_F(ProxyResolverFactoryMojoTest, DeleteResolver) { | 914 TEST_F(ProxyResolverFactoryMojoTest, DeleteResolver) { |
| 915 CreateProxyResolver(); | 915 CreateProxyResolver(); |
| 916 proxy_resolver_mojo_.reset(); | 916 proxy_resolver_mojo_.reset(); |
| 917 on_delete_callback_.WaitForResult(); | 917 on_delete_callback_.WaitForResult(); |
| 918 } | 918 } |
| 919 } // namespace net | 919 } // namespace net |
| OLD | NEW |