Always build the Vulkan code for ShellTest

Author: George Wright

shell/common/BUILD.gn

@@ -166,7 +166,7 @@ template("shell_host_executable") {
 
 if (enable_unittests) {
   declare_args() {
-    test_enable_vulkan = is_fuchsia
+    test_enable_vulkan = true
     test_enable_gl = !is_fuchsia
     test_enable_software = true
     test_enable_metal = false
@@ -196,6 +196,8 @@ if (enable_unittests) {
       "shell_test.h",
       "shell_test_platform_view.cc",
       "shell_test_platform_view.h",
+      "shell_test_platform_view_vulkan.cc",
+      "shell_test_platform_view_vulkan.h",
       "shell_unittests.cc",
       "vsync_waiters_test.cc",
       "vsync_waiters_test.h",
@@ -210,6 +212,8 @@ if (enable_unittests) {
       "//flutter/lib/ui:ui",
       "//flutter/shell",
       "//flutter/testing:dart",
+      "//flutter/testing:vulkan",
+      "//flutter/vulkan",
     ]
 
     if (!defined(defines)) {
@@ -228,20 +232,6 @@ if (enable_unittests) {
 
         defines += [ "SHELL_ENABLE_GL" ]
       }
-
-      if (test_enable_vulkan) {
-        sources += [
-          "shell_test_platform_view_vulkan.cc",
-          "shell_test_platform_view_vulkan.h",
-        ]
-
-        deps += [
-          "//flutter/testing:vulkan",
-          "//flutter/vulkan",
-        ]
-
-        defines += [ "SHELL_ENABLE_VULKAN" ]
-      }
     }
   }
 

shell/common/shell_test_platform_view.cc

@@ -7,9 +7,7 @@
 #ifdef SHELL_ENABLE_GL
 #include "flutter/shell/common/shell_test_platform_view_gl.h"
 #endif  // SHELL_ENABLE_GL
-#ifdef SHELL_ENABLE_VULKAN
 #include "flutter/shell/common/shell_test_platform_view_vulkan.h"
-#endif  // SHELL_ENABLE_VULKAN
 
 namespace flutter {
 namespace testing {
@@ -28,11 +26,9 @@ std::unique_ptr<ShellTestPlatformView> ShellTestPlatformView::Create(
       return std::make_unique<ShellTestPlatformViewGL>(
           delegate, task_runners, vsync_clock, create_vsync_waiter);
 #endif  // SHELL_ENABLE_GL
-#ifdef SHELL_ENABLE_VULKAN
     case BackendType::kVulkanBackend:
       return std::make_unique<ShellTestPlatformViewVulkan>(
           delegate, task_runners, vsync_clock, create_vsync_waiter);
-#endif  // SHELL_ENABLE_VULKAN
     default:
       FML_LOG(FATAL) << "No backends supported for ShellTestPlatformView";
       return nullptr;