OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 <utility> | 5 #include <utility> |
6 | 6 |
7 #include "base/memory/ref_counted.h" | 7 #include "base/memory/ref_counted.h" |
8 #include "base/strings/stringprintf.h" | 8 #include "base/strings/stringprintf.h" |
9 #include "extensions/browser/api/dns/host_resolver_wrapper.h" | 9 #include "extensions/browser/api/dns/host_resolver_wrapper.h" |
10 #include "extensions/browser/api/dns/mock_host_resolver_creator.h" | 10 #include "extensions/browser/api/dns/mock_host_resolver_creator.h" |
11 #include "extensions/browser/api/sockets_tcp_server/sockets_tcp_server_api.h" | 11 #include "extensions/browser/api/sockets_tcp_server/sockets_tcp_server_api.h" |
12 #include "extensions/browser/api_test_utils.h" | 12 #include "extensions/browser/api_test_utils.h" |
13 #include "extensions/browser/extension_registry.h" | 13 #include "extensions/browser/extension_registry.h" |
14 #include "extensions/common/test_util.h" | 14 #include "extensions/common/test_util.h" |
15 #include "extensions/shell/test/shell_apitest.h" | 15 #include "extensions/shell/test/shell_apitest.h" |
16 #include "extensions/test/extension_test_message_listener.h" | 16 #include "extensions/test/extension_test_message_listener.h" |
17 #include "extensions/test/result_catcher.h" | 17 #include "extensions/test/result_catcher.h" |
18 #include "net/dns/mock_host_resolver.h" | 18 #include "net/dns/mock_host_resolver.h" |
19 | 19 |
20 namespace extensions { | 20 namespace extensions { |
21 | 21 |
22 const std::string kHostname = "127.0.0.1"; | 22 const std::string kHostname = "127.0.0.1"; |
23 const int kPort = 8888; | 23 const int kPort = 8888; |
24 | 24 |
25 class SocketsTcpServerApiTest : public ShellApiTest { | 25 class SocketsTcpServerApiTest : public ShellApiTest { |
26 public: | 26 public: |
27 SocketsTcpServerApiTest() | 27 SocketsTcpServerApiTest() |
28 : resolver_event_(true, false), | 28 : resolver_event_(base::WaitableEvent::ResetPolicy::MANUAL, |
| 29 base::WaitableEvent::InitialState::NOT_SIGNALED), |
29 resolver_creator_(new MockHostResolverCreator()) {} | 30 resolver_creator_(new MockHostResolverCreator()) {} |
30 | 31 |
31 void SetUpOnMainThread() override { | 32 void SetUpOnMainThread() override { |
32 ShellApiTest::SetUpOnMainThread(); | 33 ShellApiTest::SetUpOnMainThread(); |
33 | 34 |
34 HostResolverWrapper::GetInstance()->SetHostResolverForTesting( | 35 HostResolverWrapper::GetInstance()->SetHostResolverForTesting( |
35 resolver_creator_->CreateMockHostResolver()); | 36 resolver_creator_->CreateMockHostResolver()); |
36 } | 37 } |
37 | 38 |
38 void TearDownOnMainThread() override { | 39 void TearDownOnMainThread() override { |
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
91 ASSERT_TRUE(extension); | 92 ASSERT_TRUE(extension); |
92 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message(); | 93 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message(); |
93 | 94 |
94 UnloadApp(extension); | 95 UnloadApp(extension); |
95 | 96 |
96 ASSERT_TRUE(LoadApp(path)) << message_; | 97 ASSERT_TRUE(LoadApp(path)) << message_; |
97 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message(); | 98 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message(); |
98 } | 99 } |
99 | 100 |
100 } // namespace extensions | 101 } // namespace extensions |
OLD | NEW |