BASELINE: Update Chromium to 86.0.4240.124

Change-Id: Ide0ff151e94cd665ae6521a446995d34a9d1d644
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

1 files changed, 11 insertions, 22 deletions

diff --git a/chromium/content/browser/oop_browsertest.cc b/chromium/content/browser/oop_browsertest.cc
index 97cbd3e789d..c8bbb3cf596 100644
--- a/chromium/content/browser/oop_browsertest.cc
+++ b/chromium/content/browser/oop_browsertest.cc
@@ -31,10 +31,14 @@ namespace {
 
 class OOPBrowserTest : public ContentBrowserTest {
  public:
+  void SetUp() override {
+    EnablePixelOutput();
+    ContentBrowserTest::SetUp();
+  }
+
   void SetUpCommandLine(base::CommandLine* command_line) override {
     ContentBrowserTest::SetUpCommandLine(command_line);
     command_line->AppendSwitch(switches::kEnableGpuRasterization);
-    command_line->AppendSwitch(switches::kEnablePixelOutputInTests);
     command_line->AppendSwitch(switches::kEnableOopRasterization);
     command_line->AppendSwitch(switches::kUseGpuInTests);
   }
@@ -45,7 +49,7 @@ class OOPBrowserTest : public ContentBrowserTest {
 // This test calls into system GL which is not instrumented with MSAN.
 #if !defined(MEMORY_SANITIZER)
 // Failing on linux-trusty-rel bot. https://crbug.com/1067662
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_CHROMEOS)
 #define MAYBE_Basic DISABLED_Basic
 #else
 #define MAYBE_Basic Basic
@@ -65,27 +69,12 @@ IN_PROC_BROWSER_TEST_F(OOPBrowserTest, MAYBE_Basic) {
           ->render_frame_metadata_provider());
   frame_observer.WaitForAnyFrameSubmission();
 
-  auto* rwh = shell()->web_contents()->GetRenderViewHost()->GetWidget();
-  ASSERT_TRUE(rwh->GetView()->IsSurfaceAvailableForCopy());
-  base::RunLoop run_loop;
-  SkBitmap snapshot;
-  rwh->GetView()->CopyFromSurface(
-      gfx::Rect(), gfx::Size(),
-      base::BindOnce(
-          [](SkBitmap* snapshot, base::OnceClosure done_cb,
-             const SkBitmap& bitmap) {
-            *snapshot = bitmap;
-            std::move(done_cb).Run();
-          },
-          &snapshot, run_loop.QuitWhenIdleClosure()));
-  run_loop.Run();
+  const gfx::Size kComparisonSize(300, 300);
 
-  ASSERT_FALSE(snapshot.drawsNothing());
-  for (int i = 0; i < snapshot.width(); ++i) {
-    for (int j = 0; j < snapshot.height(); ++j) {
-      ASSERT_EQ(snapshot.getColor(i, j), SK_ColorBLUE);
-    }
-  }
+  base::FilePath reference =
+      content::GetTestFilePath(nullptr, "oopbrowsertest-basic.png");
+  EXPECT_TRUE(CompareWebContentsOutputToReference(shell()->web_contents(),
+                                                  reference, kComparisonSize));
 }
 #endif