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

Side by Side Diff: chrome/browser/plugins/plugin_power_saver_browsertest.cc

Issue 2377743003: Revert of Disable flaky browser tests on Mac. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 2 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
« 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 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 <stdint.h> 5 #include <stdint.h>
6 #include <string> 6 #include <string>
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/stl_util.h" 10 #include "base/stl_util.h"
(...skipping 393 matching lines...) Expand 10 before | Expand all | Expand 10 after
404 VerifyPluginMarkedEssential(GetActiveWebContents(), "small_same_origin"); 404 VerifyPluginMarkedEssential(GetActiveWebContents(), "small_same_origin");
405 VerifyPluginMarkedEssential(GetActiveWebContents(), 405 VerifyPluginMarkedEssential(GetActiveWebContents(),
406 "small_same_origin_poster"); 406 "small_same_origin_poster");
407 VerifyPluginMarkedEssential(GetActiveWebContents(), "tiny_cross_origin_1"); 407 VerifyPluginMarkedEssential(GetActiveWebContents(), "tiny_cross_origin_1");
408 VerifyPluginMarkedEssential(GetActiveWebContents(), "tiny_cross_origin_2"); 408 VerifyPluginMarkedEssential(GetActiveWebContents(), "tiny_cross_origin_2");
409 VerifyPluginMarkedEssential(GetActiveWebContents(), "large_cross_origin"); 409 VerifyPluginMarkedEssential(GetActiveWebContents(), "large_cross_origin");
410 VerifyPluginMarkedEssential(GetActiveWebContents(), 410 VerifyPluginMarkedEssential(GetActiveWebContents(),
411 "medium_16_9_cross_origin"); 411 "medium_16_9_cross_origin");
412 } 412 }
413 413
414 // Flaky on WebKit Mac dbg bots: crbug.com/599484. 414 IN_PROC_BROWSER_TEST_F(PluginPowerSaverBrowserTest, SmallCrossOrigin) {
415 #if defined(OS_MACOSX)
416 #define MAYBE_SmallCrossOrigin DISABLED_SmallCrossOrigin
417 #else
418 #define MAYBE_SmallCrossOrigin SmallCrossOrigin
419 #endif
420 IN_PROC_BROWSER_TEST_F(PluginPowerSaverBrowserTest, MAYBE_SmallCrossOrigin) {
421 LoadHTML( 415 LoadHTML(
422 "<object id='plugin' data='http://otherorigin.com/fake.swf' " 416 "<object id='plugin' data='http://otherorigin.com/fake.swf' "
423 " type='application/x-ppapi-tests' width='400' height='100'>" 417 " type='application/x-ppapi-tests' width='400' height='100'>"
424 "</object>" 418 "</object>"
425 "<br>" 419 "<br>"
426 "<object id='plugin_poster' data='http://otherorigin.com/fake.swf' " 420 "<object id='plugin_poster' data='http://otherorigin.com/fake.swf' "
427 " type='application/x-ppapi-tests' width='400' height='100' " 421 " type='application/x-ppapi-tests' width='400' height='100' "
428 " poster='click_me.png'>" 422 " poster='click_me.png'>"
429 "</object>"); 423 "</object>");
430 424
(...skipping 20 matching lines...) Expand all
451 445
452 VerifyPluginIsThrottled(GetActiveWebContents(), "plugin_16"); 446 VerifyPluginIsThrottled(GetActiveWebContents(), "plugin_16");
453 VerifyPluginIsThrottled(GetActiveWebContents(), "plugin_32"); 447 VerifyPluginIsThrottled(GetActiveWebContents(), "plugin_32");
454 VerifyPluginIsThrottled(GetActiveWebContents(), "plugin_16_64"); 448 VerifyPluginIsThrottled(GetActiveWebContents(), "plugin_16_64");
455 VerifyPluginIsThrottled(GetActiveWebContents(), "plugin_64_16"); 449 VerifyPluginIsThrottled(GetActiveWebContents(), "plugin_64_16");
456 450
457 EXPECT_TRUE( 451 EXPECT_TRUE(
458 VerifySnapshot(FILE_PATH_LITERAL("smaller_than_play_icon_expected.png"))); 452 VerifySnapshot(FILE_PATH_LITERAL("smaller_than_play_icon_expected.png")));
459 } 453 }
460 454
461 // Flaky on WebKit Mac dbg bots: crbug.com/599484. 455 IN_PROC_BROWSER_TEST_F(PluginPowerSaverBrowserTest, PosterTests) {
462 #if defined(OS_MACOSX)
463 #define MAYBE_PosterTests DISABLED_PosterTests
464 #else
465 #define MAYBE_PosterTests PosterTests
466 #endif
467 IN_PROC_BROWSER_TEST_F(PluginPowerSaverBrowserTest, MAYBE_PosterTests) {
468 // This test simultaneously verifies the varied supported poster syntaxes, 456 // This test simultaneously verifies the varied supported poster syntaxes,
469 // as well as verifies that the poster is rendered correctly with various 457 // as well as verifies that the poster is rendered correctly with various
470 // mismatched aspect ratios and sizes, following the same rules as VIDEO. 458 // mismatched aspect ratios and sizes, following the same rules as VIDEO.
471 LoadHTML( 459 LoadHTML(
472 "<object id='plugin_src' type='application/x-ppapi-tests' " 460 "<object id='plugin_src' type='application/x-ppapi-tests' "
473 " width='100' height='100' poster='click_me.png'></object>" 461 " width='100' height='100' poster='click_me.png'></object>"
474 "<object id='plugin_srcset' type='application/x-ppapi-tests' " 462 "<object id='plugin_srcset' type='application/x-ppapi-tests' "
475 " width='100' height='100' " 463 " width='100' height='100' "
476 " poster='click_me.png 1x, click_me.png 2x'></object>" 464 " poster='click_me.png 1x, click_me.png 2x'></object>"
477 "<br>" 465 "<br>"
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after
645 633
646 IN_PROC_BROWSER_TEST_F(PluginPowerSaverBrowserTest, ZoomIndependent) { 634 IN_PROC_BROWSER_TEST_F(PluginPowerSaverBrowserTest, ZoomIndependent) {
647 ui_zoom::ZoomController::FromWebContents(GetActiveWebContents()) 635 ui_zoom::ZoomController::FromWebContents(GetActiveWebContents())
648 ->SetZoomLevel(4.0); 636 ->SetZoomLevel(4.0);
649 LoadHTML( 637 LoadHTML(
650 "<object id='plugin' data='http://otherorigin.com/fake.swf' " 638 "<object id='plugin' data='http://otherorigin.com/fake.swf' "
651 " type='application/x-ppapi-tests' width='400' height='200'>" 639 " type='application/x-ppapi-tests' width='400' height='200'>"
652 "</object>"); 640 "</object>");
653 VerifyPluginIsThrottled(GetActiveWebContents(), "plugin"); 641 VerifyPluginIsThrottled(GetActiveWebContents(), "plugin");
654 } 642 }
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