Disable RenderWidgetHostViewGuestSurfaceTest.TestGuestSurface on Viz

RenderWidgetHostViewGuestSurfaceTest.TestGuestSurface is obsolete once Viz has
been enabled by default. This disables it in that state, with a note for me to
delete it later.

TEST=RenderWidgetHostViewGuestSurfaceTest.TestGuestSurface

Bug: 762521
Change-Id: I647b1abe0d88d3b65aef5965dddada1d95b5de42
Reviewed-on: https://chromium-review.googlesource.com/1070215
Commit-Queue: Jonathan Ross <jonross@chromium.org>
Reviewed-by: Fady Samuel <fsamuel@chromium.org>
Cr-Commit-Position: refs/heads/master@{#561547}

content/browser/frame_host/render_widget_host_view_guest_unittest.cc

@@ -12,6 +12,7 @@
 #include "base/single_thread_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "build/build_config.h"
+#include "components/viz/common/features.h"
 #include "components/viz/service/frame_sinks/frame_sink_manager_impl.h"
 #include "components/viz/service/surfaces/surface.h"
 #include "components/viz/service/surfaces/surface_manager.h"
@@ -235,9 +236,12 @@ viz::CompositorFrame CreateDelegatedFrame(float scale_factor,
 }  // anonymous namespace
 
 TEST_F(RenderWidgetHostViewGuestSurfaceTest, TestGuestSurface) {
-  // TODO: fix for mash.
-  if (base::FeatureList::IsEnabled(features::kMash))
+  // TODO(jonross): Delete this test once Viz launches as it will be obsolete.
+  // https://crbug.com/844469
+  if (base::FeatureList::IsEnabled(features::kVizDisplayCompositor) ||
+      base::FeatureList::IsEnabled(features::kMash)) {
     return;
+  }
 
   gfx::Size view_size(100, 100);
   gfx::Rect view_rect(view_size);

testing/buildbot/filters/viz.content_unittests.filter

@@ -9,7 +9,6 @@
 -RenderWidgetHostViewAuraTest.ForwardsBeginFrameAcks
 -RenderWidgetHostViewAuraTest.HitTestRegionListSubmitted
 -RenderWidgetHostViewAuraTest.OutputSurfaceIdChange
--RenderWidgetHostViewGuestSurfaceTest.TestGuestSurface
 
 # Legacy using TestImageTransportFactory::GetFrameSinkManager
 -RenderWidgetHostViewAuraTest.ForwardsBeginFrameAcks