OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/command_line.h" | 5 #include "base/command_line.h" |
6 #include "base/memory/ref_counted.h" | 6 #include "base/memory/ref_counted.h" |
7 #include "base/stringprintf.h" | 7 #include "base/stringprintf.h" |
8 #include "chrome/browser/extensions/api/socket/socket_api.h" | 8 #include "chrome/browser/extensions/api/socket/socket_api.h" |
9 #include "chrome/browser/extensions/extension_apitest.h" | 9 #include "chrome/browser/extensions/extension_apitest.h" |
10 #include "chrome/browser/extensions/extension_function_test_utils.h" | 10 #include "chrome/browser/extensions/extension_function_test_utils.h" |
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
88 | 88 |
89 // TODO(miket): this test currently passes only because of artificial code | 89 // TODO(miket): this test currently passes only because of artificial code |
90 // that doesn't run in production. Fix this when we're able to. | 90 // that doesn't run in production. Fix this when we're able to. |
91 RunFunctionAndReturnError( | 91 RunFunctionAndReturnError( |
92 socket_create_function, | 92 socket_create_function, |
93 GenerateCreateFunctionArgs("xxxx", kHostname, kPort), | 93 GenerateCreateFunctionArgs("xxxx", kHostname, kPort), |
94 browser(), NONE); | 94 browser(), NONE); |
95 } | 95 } |
96 | 96 |
97 // http://crbug.com/111572 | 97 // http://crbug.com/111572 |
98 IN_PROC_BROWSER_TEST_F(SocketApiTest, FLAKY_SocketUDPExtension) { | 98 IN_PROC_BROWSER_TEST_F(SocketApiTest, DISABLED_SocketUDPExtension) { |
99 scoped_ptr<net::TestServer> test_server( | 99 scoped_ptr<net::TestServer> test_server( |
100 new net::TestServer(net::TestServer::TYPE_UDP_ECHO, | 100 new net::TestServer(net::TestServer::TYPE_UDP_ECHO, |
101 FilePath(FILE_PATH_LITERAL("net/data")))); | 101 FilePath(FILE_PATH_LITERAL("net/data")))); |
102 EXPECT_TRUE(test_server->Start()); | 102 EXPECT_TRUE(test_server->Start()); |
103 | 103 |
104 net::HostPortPair host_port_pair = test_server->host_port_pair(); | 104 net::HostPortPair host_port_pair = test_server->host_port_pair(); |
105 int port = host_port_pair.port(); | 105 int port = host_port_pair.port(); |
106 ASSERT_TRUE(port > 0); | 106 ASSERT_TRUE(port > 0); |
107 | 107 |
108 ResultCatcher catcher; | 108 ResultCatcher catcher; |
(...skipping 25 matching lines...) Expand all Loading... |
134 | 134 |
135 ExtensionTestMessageListener listener("info_please", true); | 135 ExtensionTestMessageListener listener("info_please", true); |
136 | 136 |
137 ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("socket/api"))); | 137 ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("socket/api"))); |
138 EXPECT_TRUE(listener.WaitUntilSatisfied()); | 138 EXPECT_TRUE(listener.WaitUntilSatisfied()); |
139 listener.Reply( | 139 listener.Reply( |
140 base::StringPrintf("tcp:%s:%d", host_port_pair.host().c_str(), port)); | 140 base::StringPrintf("tcp:%s:%d", host_port_pair.host().c_str(), port)); |
141 | 141 |
142 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message(); | 142 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message(); |
143 } | 143 } |
OLD | NEW |