Test vulkan webview path

Before this, features::IsUsingVulkan is returning false on the Pie bot
because of the android version check in IsUsingVulkan. This ends up
causing testHardwareRenderingSmokeTestVulkanWhereSupported to use the
interop path instead of the real vulkan composite path.

Fix this by checking webview conditions before checking for android
version, and verified test is using vulkan composite now.

Bug: 1141687
Change-Id: Ida7e5ba778bdaf4cb04c00760598cf808647be46
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2644863Reviewed-by: Vasiliy Telezhnikov <vasilyt@chromium.org>
Commit-Queue: Bo <boliu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#846338}

gpu/config/gpu_finch_features.cc

@@ -183,20 +183,21 @@ bool IsUsingVulkan() {
           features::kVulkan.name, base::FeatureList::OVERRIDE_ENABLE_FEATURE))
     return true;
 
+  // WebView checks, which do not use (and disables) kVulkan.
+  // Do this above the Android version check because there are test devices
+  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kWebViewDrawFunctorUsesVulkan) &&
+      base::FeatureList::IsEnabled(kWebViewVulkan)) {
+    return true;
+  }
+
   // No support for devices before Q -- exit before checking feature flags
   // so that devices are not counted in finch trials.
   if (base::android::BuildInfo::GetInstance()->sdk_int() <
       base::android::SDK_VERSION_Q)
     return false;
 
-  // WebView defaults disables Vulkan in AwMainDelegate::BasicStartupComplete.
-  bool enable = base::FeatureList::IsEnabled(kVulkan);
-
-  // Check WebView support.
-  enable = enable || (base::CommandLine::ForCurrentProcess()->HasSwitch(
-                          switches::kWebViewDrawFunctorUsesVulkan) &&
-                      base::FeatureList::IsEnabled(kWebViewVulkan));
-  return enable;
+  return base::FeatureList::IsEnabled(kVulkan);
 #else
   return base::FeatureList::IsEnabled(kVulkan);
 #endif