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 "base/memory/ref_counted.h" | 5 #include "base/memory/ref_counted.h" |
6 #include "base/path_service.h" | 6 #include "base/path_service.h" |
7 #include "base/strings/stringprintf.h" | 7 #include "base/strings/stringprintf.h" |
8 #include "chrome/browser/extensions/api/dns/host_resolver_wrapper.h" | 8 #include "chrome/browser/extensions/api/dns/host_resolver_wrapper.h" |
9 #include "chrome/browser/extensions/api/dns/mock_host_resolver_creator.h" | 9 #include "chrome/browser/extensions/api/dns/mock_host_resolver_creator.h" |
10 #include "chrome/browser/extensions/api/sockets_tcp_server/sockets_tcp_server_ap i.h" | |
11 #include "chrome/browser/extensions/extension_apitest.h" | 10 #include "chrome/browser/extensions/extension_apitest.h" |
12 #include "chrome/browser/extensions/extension_function_test_utils.h" | 11 #include "chrome/browser/extensions/extension_function_test_utils.h" |
13 #include "chrome/browser/extensions/extension_service.h" | 12 #include "chrome/browser/extensions/extension_service.h" |
14 #include "chrome/browser/extensions/extension_test_message_listener.h" | 13 #include "chrome/browser/extensions/extension_test_message_listener.h" |
15 #include "chrome/browser/ui/browser.h" | 14 #include "chrome/browser/ui/browser.h" |
16 #include "chrome/browser/ui/extensions/application_launch.h" | 15 #include "chrome/browser/ui/extensions/application_launch.h" |
17 #include "chrome/common/chrome_paths.h" | 16 #include "chrome/common/chrome_paths.h" |
18 #include "chrome/test/base/in_process_browser_test.h" | 17 #include "chrome/test/base/in_process_browser_test.h" |
19 #include "chrome/test/base/ui_test_utils.h" | 18 #include "chrome/test/base/ui_test_utils.h" |
19 #include "extensions/browser/api/sockets_tcp_server/sockets_tcp_server_api.h" | |
20 #include "net/dns/mock_host_resolver.h" | 20 #include "net/dns/mock_host_resolver.h" |
21 #include "net/test/spawned_test_server/spawned_test_server.h" | 21 #include "net/test/spawned_test_server/spawned_test_server.h" |
22 | 22 |
23 using extensions::Extension; | 23 using extensions::Extension; |
24 using extensions::api::SocketsTcpServerCreateFunction; | 24 using extensions::core_api::SocketsTcpServerCreateFunction; |
25 | 25 |
26 namespace utils = extension_function_test_utils; | 26 namespace utils = extension_function_test_utils; |
27 | 27 |
28 namespace { | 28 namespace { |
29 | 29 |
30 // TODO(jschuh): Hanging plugin tests. crbug.com/244653 | 30 // TODO(jschuh): Hanging plugin tests. crbug.com/244653 |
31 #if defined(OS_WIN) && defined(ARCH_CPU_X86_64) | 31 #if defined(OS_WIN) && defined(ARCH_CPU_X86_64) |
32 #define MAYBE(x) DISABLED_##x | 32 #define MAYBE(x) DISABLED_##x |
33 #else | 33 #else |
34 #define MAYBE(x) x | 34 #define MAYBE(x) x |
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
92 ASSERT_TRUE(LoadExtension(path)); | 92 ASSERT_TRUE(LoadExtension(path)); |
93 EXPECT_TRUE(listener.WaitUntilSatisfied()); | 93 EXPECT_TRUE(listener.WaitUntilSatisfied()); |
94 listener.Reply( | 94 listener.Reply( |
95 base::StringPrintf("tcp_server:%s:%d", kHostname.c_str(), kPort)); | 95 base::StringPrintf("tcp_server:%s:%d", kHostname.c_str(), kPort)); |
96 | 96 |
97 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message(); | 97 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message(); |
98 } | 98 } |
99 | 99 |
100 IN_PROC_BROWSER_TEST_F(SocketsTcpServerApiTest, SocketTCPServerUnbindOnUnload) { | 100 IN_PROC_BROWSER_TEST_F(SocketsTcpServerApiTest, SocketTCPServerUnbindOnUnload) { |
101 base::FilePath path = test_data_dir_.AppendASCII("sockets_tcp_server/unload"); | 101 base::FilePath path = test_data_dir_.AppendASCII("sockets_tcp_server/unload"); |
102 LOG(ERROR) << "sucks"; | |
James Cook
2014/03/06 18:31:00
remove this line
Ken Rockot(use gerrit already)
2014/03/06 18:46:32
Done.
| |
102 ResultCatcher catcher; | 103 ResultCatcher catcher; |
103 const Extension* extension = LoadExtension(path); | 104 const Extension* extension = LoadExtension(path); |
104 ASSERT_TRUE(extension); | 105 ASSERT_TRUE(extension); |
105 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message(); | 106 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message(); |
106 | 107 |
107 UnloadExtension(extension->id()); | 108 UnloadExtension(extension->id()); |
108 | 109 |
109 ASSERT_TRUE(LoadExtension(path)) << message_; | 110 ASSERT_TRUE(LoadExtension(path)) << message_; |
110 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message(); | 111 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message(); |
111 } | 112 } |
OLD | NEW |