Commit 7cb39426 authored by Findit's avatar Findit

Revert "Enable the pixel by pixel comparison test for Mac OS."

This reverts commit 01ccf727.

Reason for revert:

Findit (https://goo.gl/kROfz5) identified CL at revision 601879 as the
culprit for flakes in the build cycles as shown on:
https://findit-for-me.appspot.com/waterfall/flake/flake-culprit?key=ag9zfmZpbmRpdC1mb3ItbWVyQwsSDEZsYWtlQ3VscHJpdCIxY2hyb21pdW0vMDFjY2Y3Mjc3NjRjNTE1MTUzNDc4ZDJiYjM0MGYwNjg4NzRkNjZkNQw

Sample Failed Build: https://ci.chromium.org/buildbot/chromium.mac/Mac10.12%20Tests/16124

Sample Failed Step: browser_tests on (none) GPU on Mac on Mac-10.12.6

Sample Flaky Test: PictureInPicturePixelComparisonBrowserTest.VideoPlay

Original change's description:
> Enable the pixel by pixel comparison test for Mac OS.
> 
> 1. Tested on Mac and verify everything works as expected.
> 2. Removed the unnecessary call of GetNativeWindow().
> 
> Change-Id: I377e6bfb004548887b9623b0094da91fa36b4d1c
> Reviewed-on: https://chromium-review.googlesource.com/c/1279301
> Reviewed-by: Mounir Lamouri <mlamouri@chromium.org>
> Commit-Queue: Clifford Cheng <cliffordcheng@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#601879}

Change-Id: I54c6f61e3cb1f6bbd0997ccc1e8d616c9977d21d
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 898146
Reviewed-on: https://chromium-review.googlesource.com/c/1296312
Cr-Commit-Position: refs/heads/master@{#601907}
parent 3c1a127c
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
#include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_commands.h" #include "chrome/browser/ui/browser_commands.h"
#include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/browser/ui/tabs/tab_strip_model.h"
#include "chrome/browser/ui/views/overlay/overlay_window_views.h"
#include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/in_process_browser_test.h"
#include "chrome/test/base/ui_test_utils.h" #include "chrome/test/base/ui_test_utils.h"
#include "components/viz/common/frame_sinks/copy_output_request.h" #include "components/viz/common/frame_sinks/copy_output_request.h"
...@@ -189,7 +190,7 @@ IN_PROC_BROWSER_TEST_F(PictureInPictureWindowControllerBrowserTest, ...@@ -189,7 +190,7 @@ IN_PROC_BROWSER_TEST_F(PictureInPictureWindowControllerBrowserTest,
EXPECT_TRUE(window_controller()->GetWindowForTesting()->IsVisible()); EXPECT_TRUE(window_controller()->GetWindowForTesting()->IsVisible());
} }
#if (defined(OS_MACOSX) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
class PictureInPicturePixelComparisonBrowserTest class PictureInPicturePixelComparisonBrowserTest
: public PictureInPictureWindowControllerBrowserTest { : public PictureInPictureWindowControllerBrowserTest {
public: public:
...@@ -232,7 +233,8 @@ class PictureInPicturePixelComparisonBrowserTest ...@@ -232,7 +233,8 @@ class PictureInPicturePixelComparisonBrowserTest
base::BindOnce( base::BindOnce(
&PictureInPicturePixelComparisonBrowserTest::ReadbackResult, &PictureInPicturePixelComparisonBrowserTest::ReadbackResult,
base::Unretained(this), run_loop.QuitClosure())); base::Unretained(this), run_loop.QuitClosure()));
overlay_window_views->GetLayer()->RequestCopyOfOutput(std::move(request)); overlay_window_views->GetNativeWindow()->layer()->RequestCopyOfOutput(
std::move(request));
run_loop.Run(); run_loop.Run();
} }
...@@ -269,7 +271,8 @@ class PictureInPicturePixelComparisonBrowserTest ...@@ -269,7 +271,8 @@ class PictureInPicturePixelComparisonBrowserTest
std::unique_ptr<SkBitmap> result_bitmap_; std::unique_ptr<SkBitmap> result_bitmap_;
}; };
// TODO(cliffordcheng): enable on Windows when compile errors are resolved. // TODO(cliffordcheng): enable this tests on other platforms when
// Windows and Mac capture screen problem is solved.
// Plays a video and then trigger Picture-in-Picture. Grabs a screenshot of // Plays a video and then trigger Picture-in-Picture. Grabs a screenshot of
// Picture-in-Picture window and verifies it's as expected. // Picture-in-Picture window and verifies it's as expected.
IN_PROC_BROWSER_TEST_F(PictureInPicturePixelComparisonBrowserTest, VideoPlay) { IN_PROC_BROWSER_TEST_F(PictureInPicturePixelComparisonBrowserTest, VideoPlay) {
...@@ -317,7 +320,7 @@ IN_PROC_BROWSER_TEST_F(PictureInPicturePixelComparisonBrowserTest, VideoPlay) { ...@@ -317,7 +320,7 @@ IN_PROC_BROWSER_TEST_F(PictureInPicturePixelComparisonBrowserTest, VideoPlay) {
ASSERT_TRUE(SaveBitmap(test_image_path, GetResultBitmap())); ASSERT_TRUE(SaveBitmap(test_image_path, GetResultBitmap()));
EXPECT_TRUE(CompareImages(GetResultBitmap())); EXPECT_TRUE(CompareImages(GetResultBitmap()));
} }
#endif // (defined(OS_MACOSX) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) #endif // defined(OS_LINUX) && !defined(OS_CHROMEOS)
// Tests that when an active WebContents accurately tracks whether a video // Tests that when an active WebContents accurately tracks whether a video
// is in Picture-in-Picture. // is in Picture-in-Picture.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment