Skip IncompatibleApplicationsBrowserTest test setup in viz_browser_tests

This test seems to crash on our bots before it reaches the test fixture
code. I assume that is failing somewhere in SetUp, but there is no stack
trace to confirm that. I'm speculatively disabling some code when this
feature flag is set. We'll see if that greens our bots.

Also, remove the OFFICIAL_BUILD ifdef check. This code is only compiled
when is_chrome_branded is true.

NOTRY=True
TBR=chrisha@chromium.org, mhosen@chromium.org, mohsen@chromium.org
BUG=850517

Change-Id: I9f7e1fc8d826e830fc3e5284bff7e9cd6344fd7b
Reviewed-on: https://chromium-review.googlesource.com/1101408Reviewed-by: Reid Kleckner <rnk@chromium.org>
Commit-Queue: Reid Kleckner <rnk@chromium.org>
Cr-Commit-Position: refs/heads/master@{#567343}

chrome/browser/conflicts/incompatible_applications_browsertest.cc

@@ -83,21 +83,27 @@ class IncompatibleApplicationsBrowserTest : public InProcessBrowserTest {
   ~IncompatibleApplicationsBrowserTest() override = default;
 
   void SetUp() override {
-    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));
-
-    scoped_feature_list_.InitWithFeatures(
-        // Enabled features.
-        {features::kModuleDatabase, features::kIncompatibleApplicationsWarning},
-        // Disabled features.
-        {});
-
-    ASSERT_NO_FATAL_FAILURE(CreateModuleList());
-    ASSERT_NO_FATAL_FAILURE(InstallThirdPartyApplication());
+    // 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 (!base::FeatureList::IsEnabled(features::kVizDisplayCompositor)) {
+      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));
+
+      scoped_feature_list_.InitWithFeatures(
+          // Enabled features.
+          {features::kModuleDatabase,
+           features::kIncompatibleApplicationsWarning},
+          // Disabled features.
+          {});
+
+      ASSERT_NO_FATAL_FAILURE(CreateModuleList());
+      ASSERT_NO_FATAL_FAILURE(InstallThirdPartyApplication());
+    }
 
     InProcessBrowserTest::SetUp();
   }
@@ -197,11 +203,9 @@ IN_PROC_BROWSER_TEST_F(IncompatibleApplicationsBrowserTest,
   if (base::win::GetVersion() < base::win::VERSION_WIN10)
     return;
 
-#if defined(OFFICIAL_BUILD)
   // TODO(crbug.com/850517) This fails in viz_browser_tests in official builds.
   if (base::FeatureList::IsEnabled(features::kVizDisplayCompositor))
     return;
-#endif
 
   ModuleDatabase* module_database = ModuleDatabase::GetInstance();