| 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> |
| 11 #include <string> | 11 #include <string> |
| 12 #include <utility> | 12 #include <utility> |
| 13 #include <vector> | 13 #include <vector> |
| 14 | 14 |
| 15 #include "base/bind.h" | 15 #include "base/bind.h" |
| 16 #include "base/memory/ptr_util.h" | 16 #include "base/memory/ptr_util.h" |
| 17 #include "base/message_loop/message_loop.h" | 17 #include "base/message_loop/message_loop.h" |
| 18 #include "base/run_loop.h" | 18 #include "base/run_loop.h" |
| 19 #include "base/stl_util.h" | 19 #include "base/stl_util.h" |
| 20 #include "base/values.h" | 20 #include "base/values.h" |
| 21 #include "mojo/common/common_type_converters.h" | 21 #include "mojo/common/common_type_converters.h" |
| 22 #include "mojo/public/cpp/bindings/binding.h" | 22 #include "mojo/public/cpp/bindings/binding.h" |
| 23 #include "net/base/load_states.h" | 23 #include "net/base/load_states.h" |
| 24 #include "net/base/net_errors.h" | 24 #include "net/base/net_errors.h" |
| 25 #include "net/base/test_completion_callback.h" | 25 #include "net/base/test_completion_callback.h" |
| 26 #include "net/dns/host_resolver.h" | 26 #include "net/dns/host_resolver.h" |
| 27 #include "net/log/net_log_event_type.h" |
| 27 #include "net/log/test_net_log.h" | 28 #include "net/log/test_net_log.h" |
| 28 #include "net/proxy/mojo_proxy_resolver_factory.h" | 29 #include "net/proxy/mojo_proxy_resolver_factory.h" |
| 29 #include "net/proxy/mojo_proxy_type_converters.h" | 30 #include "net/proxy/mojo_proxy_type_converters.h" |
| 30 #include "net/proxy/proxy_info.h" | 31 #include "net/proxy/proxy_info.h" |
| 31 #include "net/proxy/proxy_resolver.h" | 32 #include "net/proxy/proxy_resolver.h" |
| 32 #include "net/proxy/proxy_resolver_error_observer.h" | 33 #include "net/proxy/proxy_resolver_error_observer.h" |
| 33 #include "net/proxy/proxy_resolver_script_data.h" | 34 #include "net/proxy/proxy_resolver_script_data.h" |
| 34 #include "net/test/event_waiter.h" | 35 #include "net/test/event_waiter.h" |
| 35 #include "net/test/gtest_util.h" | 36 #include "net/test/gtest_util.h" |
| 36 #include "testing/gmock/include/gmock/gmock.h" | 37 #include "testing/gmock/include/gmock/gmock.h" |
| (...skipping 466 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 503 | 504 |
| 504 EventWaiter<Event>& waiter() { return waiter_; } | 505 EventWaiter<Event>& waiter() { return waiter_; } |
| 505 | 506 |
| 506 private: | 507 private: |
| 507 EventWaiter<Event> waiter_; | 508 EventWaiter<Event> waiter_; |
| 508 }; | 509 }; |
| 509 | 510 |
| 510 void CheckCapturedNetLogEntries(const std::string& expected_string, | 511 void CheckCapturedNetLogEntries(const std::string& expected_string, |
| 511 const TestNetLogEntry::List& entries) { | 512 const TestNetLogEntry::List& entries) { |
| 512 ASSERT_EQ(2u, entries.size()); | 513 ASSERT_EQ(2u, entries.size()); |
| 513 EXPECT_EQ(NetLog::TYPE_PAC_JAVASCRIPT_ALERT, entries[0].type); | 514 EXPECT_EQ(NetLogEventType::PAC_JAVASCRIPT_ALERT, entries[0].type); |
| 514 std::string message; | 515 std::string message; |
| 515 ASSERT_TRUE(entries[0].GetStringValue("message", &message)); | 516 ASSERT_TRUE(entries[0].GetStringValue("message", &message)); |
| 516 EXPECT_EQ(expected_string, message); | 517 EXPECT_EQ(expected_string, message); |
| 517 ASSERT_FALSE(entries[0].params->HasKey("line_number")); | 518 ASSERT_FALSE(entries[0].params->HasKey("line_number")); |
| 518 message.clear(); | 519 message.clear(); |
| 519 EXPECT_EQ(NetLog::TYPE_PAC_JAVASCRIPT_ERROR, entries[1].type); | 520 EXPECT_EQ(NetLogEventType::PAC_JAVASCRIPT_ERROR, entries[1].type); |
| 520 ASSERT_TRUE(entries[1].GetStringValue("message", &message)); | 521 ASSERT_TRUE(entries[1].GetStringValue("message", &message)); |
| 521 EXPECT_EQ(expected_string, message); | 522 EXPECT_EQ(expected_string, message); |
| 522 int line_number = 0; | 523 int line_number = 0; |
| 523 ASSERT_TRUE(entries[1].GetIntegerValue("line_number", &line_number)); | 524 ASSERT_TRUE(entries[1].GetIntegerValue("line_number", &line_number)); |
| 524 EXPECT_EQ(12345, line_number); | 525 EXPECT_EQ(12345, line_number); |
| 525 } | 526 } |
| 526 | 527 |
| 527 } // namespace | 528 } // namespace |
| 528 | 529 |
| 529 class ProxyResolverFactoryMojoTest : public testing::Test, | 530 class ProxyResolverFactoryMojoTest : public testing::Test, |
| (...skipping 378 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 908 mock_proxy_resolver_.ClearBlockedClients(); | 909 mock_proxy_resolver_.ClearBlockedClients(); |
| 909 request->WaitForResult(); | 910 request->WaitForResult(); |
| 910 } | 911 } |
| 911 | 912 |
| 912 TEST_F(ProxyResolverFactoryMojoTest, DeleteResolver) { | 913 TEST_F(ProxyResolverFactoryMojoTest, DeleteResolver) { |
| 913 CreateProxyResolver(); | 914 CreateProxyResolver(); |
| 914 proxy_resolver_mojo_.reset(); | 915 proxy_resolver_mojo_.reset(); |
| 915 on_delete_callback_.WaitForResult(); | 916 on_delete_callback_.WaitForResult(); |
| 916 } | 917 } |
| 917 } // namespace net | 918 } // namespace net |
| OLD | NEW |