Revert "Enable VK_LAYER_LUNARG_standard_validation with VK_KHR_xlib_surface"

This reverts commit 0d06e98a.

Reason for revert: Causes a crash:

VUID_Undefined(ERROR / SPEC): msgNum: 0 - Instance Extension VK_KHR_xlib_surface is not supported by this layer.  Using this extension may adversely affect validation results and/or produce undefined behavior.
    Objects: 1
        [0] 0, type: 0, name: NULL
Received signal 11 SEGV_MAPERR 000000000040

Original change's description:
> Enable VK_LAYER_LUNARG_standard_validation with VK_KHR_xlib_surface
> 
> Tested it with vulkan-validationlayers-1.0.106
> 
> Bug: 843346
> Change-Id: I180d690421ede3251721452334e59b35c28f0d49
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1662534
> Commit-Queue: Peng Huang <penghuang@chromium.org>
> Auto-Submit: Peng Huang <penghuang@chromium.org>
> Reviewed-by: Jonathan Backer <backer@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#669729}

TBR=penghuang@chromium.org,backer@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 843346
Change-Id: I5a164b461039cdf1805594fcff697a9e99e60714
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1665430Reviewed-by: Michael Spang <spang@chromium.org>
Commit-Queue: Michael Spang <spang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#670283}

gpu/vulkan/vulkan_instance.cc

@@ -148,26 +148,19 @@ bool VulkanInstance::Initialize(
 
   // TODO(crbug.com/843346): Make validation work in combination with
   // VK_KHR_xlib_surface or switch to VK_KHR_xcb_surface.
-  constexpr base::StringPiece xlib_surface_extension_name(
-      "VK_KHR_xlib_surface");
-  bool require_xlib_surface_extension =
+  const base::StringPiece xlib_surface_extension_name("VK_KHR_xlib_surface");
+  bool enable_validation =
       std::find_if(enabled_extensions.begin(), enabled_extensions.end(),
                    [xlib_surface_extension_name](const char* e) {
                      return xlib_surface_extension_name == e;
-                   }) != enabled_extensions.end();
-
-  // VK_LAYER_LUNARG_standard_validation 1.0.106 is required to support
-  // VK_KHR_xlib_surface.
-  constexpr base::StringPiece standard_validation(
-      "VK_LAYER_LUNARG_standard_validation");
-  for (const VkLayerProperties& layer_property : instance_layers) {
-    if (standard_validation != layer_property.layerName)
-      continue;
-    if (!require_xlib_surface_extension ||
-        layer_property.specVersion >= VK_MAKE_VERSION(1, 0, 106)) {
-      enabled_layer_names.push_back(standard_validation.data());
+                   }) == enabled_extensions.end();
+  if (enable_validation) {
+    constexpr base::StringPiece standard_validation(
+        "VK_LAYER_LUNARG_standard_validation");
+    for (const VkLayerProperties& layer_property : instance_layers) {
+      if (standard_validation == layer_property.layerName)
+        enabled_layer_names.push_back(standard_validation.data());
     }
-    break;
   }
 #endif  // DCHECK_IS_ON()