Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(212)

Side by Side Diff: chrome/browser/extensions/api/cast_streaming/cast_streaming_apitest.cc

Issue 410563002: Revert of Disable a flaky test. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 <algorithm> 5 #include <algorithm>
6 #include <cmath> 6 #include <cmath>
7 7
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/float_util.h" 9 #include "base/float_util.h"
10 #include "base/run_loop.h" 10 #include "base/run_loop.h"
(...skipping 277 matching lines...) Expand 10 before | Expand all | Expand 10 after
288 EnablePixelOutput(); 288 EnablePixelOutput();
289 CastStreamingApiTest::SetUp(); 289 CastStreamingApiTest::SetUp();
290 } 290 }
291 291
292 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { 292 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
293 command_line->AppendSwitchASCII(::switches::kWindowSize, "128,128"); 293 command_line->AppendSwitchASCII(::switches::kWindowSize, "128,128");
294 CastStreamingApiTest::SetUpCommandLine(command_line); 294 CastStreamingApiTest::SetUpCommandLine(command_line);
295 } 295 }
296 }; 296 };
297 297
298 // http://crbug.com/395726 298 // http://crbug.com/177163
299 #if defined(OS_WIN) && !defined(NDEBUG)
300 #define MAYBE_EndToEnd DISABLED_TabsApi
301 #else
302 #define MAYBE_EndToEnd EndToEnd
303 #endif // defined(OS_WIN) && !defined(NDEBUG)
299 // Tests the Cast streaming API and its basic functionality end-to-end. An 304 // Tests the Cast streaming API and its basic functionality end-to-end. An
300 // extension subtest is run to generate test content, capture that content, and 305 // extension subtest is run to generate test content, capture that content, and
301 // use the API to send it out. At the same time, this test launches an 306 // use the API to send it out. At the same time, this test launches an
302 // in-process Cast receiver, listening on a localhost UDP socket, to receive the 307 // in-process Cast receiver, listening on a localhost UDP socket, to receive the
303 // content and check whether it matches expectations. 308 // content and check whether it matches expectations.
304 IN_PROC_BROWSER_TEST_F(CastStreamingApiTestWithPixelOutput, DISABLED_EndToEnd) { 309 IN_PROC_BROWSER_TEST_F(CastStreamingApiTestWithPixelOutput, MAYBE_EndToEnd) {
305 scoped_ptr<net::UDPSocket> receive_socket( 310 scoped_ptr<net::UDPSocket> receive_socket(
306 new net::UDPSocket(net::DatagramSocket::DEFAULT_BIND, 311 new net::UDPSocket(net::DatagramSocket::DEFAULT_BIND,
307 net::RandIntCallback(), 312 net::RandIntCallback(),
308 NULL, 313 NULL,
309 net::NetLog::Source())); 314 net::NetLog::Source()));
310 receive_socket->AllowAddressReuse(); 315 receive_socket->AllowAddressReuse();
311 ASSERT_EQ(net::OK, receive_socket->Bind(GetFreeLocalPort())); 316 ASSERT_EQ(net::OK, receive_socket->Bind(GetFreeLocalPort()));
312 net::IPEndPoint receiver_end_point; 317 net::IPEndPoint receiver_end_point;
313 ASSERT_EQ(net::OK, receive_socket->GetLocalAddress(&receiver_end_point)); 318 ASSERT_EQ(net::OK, receive_socket->GetLocalAddress(&receiver_end_point));
314 receive_socket.reset(); 319 receive_socket.reset();
(...skipping 27 matching lines...) Expand all
342 347
343 delete receiver; 348 delete receiver;
344 cast_environment->Shutdown(); 349 cast_environment->Shutdown();
345 } 350 }
346 351
347 IN_PROC_BROWSER_TEST_F(CastStreamingApiTestWithPixelOutput, RtpStreamError) { 352 IN_PROC_BROWSER_TEST_F(CastStreamingApiTestWithPixelOutput, RtpStreamError) {
348 ASSERT_TRUE(RunExtensionSubtest("cast_streaming", "rtp_stream_error.html")); 353 ASSERT_TRUE(RunExtensionSubtest("cast_streaming", "rtp_stream_error.html"));
349 } 354 }
350 355
351 } // namespace extensions 356 } // namespace extensions
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698