Remove the Viz Check

Viz is on by default. This change removes the feature check.

There were two remaining usages of the check in tests, this updates them
Both pass when ran locally.

IncompatibleApplicationsBrowserTest itself should have been unaffected.
At the time others couldn't repro locally, but never tried debugging on
swarming. The bot which demonstrated the failure no longer exists. So
let's bring it back on.

TEST=IncompatibleApplicationsBrowserTest, CastContentGpuClient
Bug: 936425, 850517

Change-Id: I193ec76f311b093f3f1aa6cf609238a3c313134d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2001554Reviewed-by: Patrick Monette <pmonette@chromium.org>
Reviewed-by: Sergey Volk <servolk@chromium.org>
Reviewed-by: kylechar <kylechar@chromium.org>
Commit-Queue: Jonathan Ross <jonross@chromium.org>
Cr-Commit-Position: refs/heads/master@{#732214}

chrome/browser/win/conflicts/incompatible_applications_browsertest.cc

@@ -27,7 +27,6 @@
 #include "chrome/test/base/in_process_browser_test.h"
 #include "components/prefs/pref_change_registrar.h"
 #include "components/prefs/pref_service.h"
-#include "components/viz/common/features.h"
 
 // This class allows to wait until the kIncompatibleApplications preference is
 // modified. This can only happen if a new incompatible application is found,
@@ -86,23 +85,18 @@ class IncompatibleApplicationsBrowserTest : public InProcessBrowserTest {
   ~IncompatibleApplicationsBrowserTest() override = default;
 
   void SetUp() override {
-    // TODO(crbug.com/850517): Don't do test-specific setup if the test isn't
-    // going to do anything. It seems to conflict with the VizDisplayCompositor
-    // feature.
-    if (!features::IsVizDisplayCompositorEnabled()) {
-      ASSERT_TRUE(scoped_temp_dir_.CreateUniqueTempDir());
+    ASSERT_TRUE(scoped_temp_dir_.CreateUniqueTempDir());
 
-      ASSERT_NO_FATAL_FAILURE(
-          registry_override_manager_.OverrideRegistry(HKEY_LOCAL_MACHINE));
-      ASSERT_NO_FATAL_FAILURE(
-          registry_override_manager_.OverrideRegistry(HKEY_CURRENT_USER));
+    ASSERT_NO_FATAL_FAILURE(
+        registry_override_manager_.OverrideRegistry(HKEY_LOCAL_MACHINE));
+    ASSERT_NO_FATAL_FAILURE(
+        registry_override_manager_.OverrideRegistry(HKEY_CURRENT_USER));
 
-      scoped_feature_list_.InitAndEnableFeature(
-          features::kIncompatibleApplicationsWarning);
+    scoped_feature_list_.InitAndEnableFeature(
+        features::kIncompatibleApplicationsWarning);
 
-      ASSERT_NO_FATAL_FAILURE(CreateModuleList());
-      ASSERT_NO_FATAL_FAILURE(InstallThirdPartyApplication());
-    }
+    ASSERT_NO_FATAL_FAILURE(CreateModuleList());
+    ASSERT_NO_FATAL_FAILURE(InstallThirdPartyApplication());
 
     InProcessBrowserTest::SetUp();
   }
@@ -204,10 +198,6 @@ IN_PROC_BROWSER_TEST_F(IncompatibleApplicationsBrowserTest,
   if (base::win::GetVersion() < base::win::Version::WIN10)
     return;
 
-  // TODO(crbug.com/850517) This fails in viz_browser_tests in official builds.
-  if (features::IsVizDisplayCompositorEnabled())
-    return;
-
   ModuleDatabase* module_database = ModuleDatabase::GetInstance();
 
   // Speed up the test.

chromecast/gpu/cast_content_gpu_client.cc

@@ -6,7 +6,6 @@
 
 #include "base/memory/ptr_util.h"
 #include "base/single_thread_task_runner.h"
-#include "components/viz/common/features.h"
 #include "components/viz/service/display/overlay_strategy_underlay_cast.h"
 #include "content/public/child/child_thread.h"
 
@@ -23,19 +22,17 @@ std::unique_ptr<CastContentGpuClient> CastContentGpuClient::Create() {
 
 void CastContentGpuClient::PostCompositorThreadCreated(
     base::SingleThreadTaskRunner* task_runner) {
-  if (features::IsVizDisplayCompositorEnabled()) {
-    DCHECK(task_runner);
-    mojo::PendingRemote<chromecast::media::mojom::VideoGeometrySetter>
-        video_geometry_setter;
-    content::ChildThread::Get()->BindHostReceiver(
-        video_geometry_setter.InitWithNewPipeAndPassReceiver());
-
-    task_runner->PostTask(
-        FROM_HERE,
-        base::BindOnce(
-            &viz::OverlayStrategyUnderlayCast::ConnectVideoGeometrySetter,
-            std::move(video_geometry_setter)));
-  }
+  DCHECK(task_runner);
+  mojo::PendingRemote<chromecast::media::mojom::VideoGeometrySetter>
+      video_geometry_setter;
+  content::ChildThread::Get()->BindHostReceiver(
+      video_geometry_setter.InitWithNewPipeAndPassReceiver());
+
+  task_runner->PostTask(
+      FROM_HERE,
+      base::BindOnce(
+          &viz::OverlayStrategyUnderlayCast::ConnectVideoGeometrySetter,
+          std::move(video_geometry_setter)));
 }
 
 }  // namespace shell

components/viz/common/features.cc

@@ -47,11 +47,6 @@ const base::Feature kVizForWebView{"VizForWebView",
 const base::Feature kUseRealBuffersForPageFlipTest{
     "UseRealBuffersForPageFlipTest", base::FEATURE_DISABLED_BY_DEFAULT};
 
-bool IsVizDisplayCompositorEnabled() {
-  // TODO(crbug.com/936425): Delete function when it's no longer checked.
-  return true;
-}
-
 const base::Feature kUsePreferredIntervalForVideo{
     "UsePreferredIntervalForVideo", base::FEATURE_DISABLED_BY_DEFAULT};
 

components/viz/common/features.h

@@ -19,7 +19,6 @@ VIZ_COMMON_EXPORT extern const base::Feature kVizForWebView;
 VIZ_COMMON_EXPORT extern const base::Feature kUsePreferredIntervalForVideo;
 VIZ_COMMON_EXPORT extern const base::Feature kUseRealBuffersForPageFlipTest;
 
-VIZ_COMMON_EXPORT bool IsVizDisplayCompositorEnabled();
 VIZ_COMMON_EXPORT bool IsVizHitTestingDebugEnabled();
 VIZ_COMMON_EXPORT bool IsUsingSkiaForGLReadback();
 VIZ_COMMON_EXPORT bool IsUsingSkiaRenderer();