Revert of Remove enable_vulkan from build/config, and move it to the buildflag_header system.

content/browser/renderer_host/compositor_impl_android.cc

Index: content/browser/renderer_host/compositor_impl_android.cc
diff --git a/content/browser/renderer_host/compositor_impl_android.cc b/content/browser/renderer_host/compositor_impl_android.cc
index 0ed2a5c70df2cf2097880db42353602028af749e..032239f506d355024d1abcbbaaac0c30bc45ea85 100644
--- a/content/browser/renderer_host/compositor_impl_android.cc
+++ b/content/browser/renderer_host/compositor_impl_android.cc
@@ -61,7 +61,6 @@
 #include "gpu/ipc/client/command_buffer_proxy_impl.h"
 #include "gpu/ipc/client/gpu_channel_host.h"
 #include "gpu/ipc/common/gpu_surface_tracker.h"
-#include "gpu/vulkan/features.h"
 #include "gpu/vulkan/vulkan_surface.h"
 #include "services/ui/public/cpp/gpu/context_provider_command_buffer.h"
 #include "third_party/khronos/GLES2/gl2.h"
@@ -100,7 +99,7 @@
   cc::SurfaceManager surface_manager;
   cc::FrameSinkIdAllocator frame_sink_id_allocator;
 
-#if BUILDFLAG(ENABLE_VULKAN)
+#if defined(ENABLE_VULKAN)
   scoped_refptr<cc::VulkanContextProvider> vulkan_context_provider;
 #endif
 };
@@ -110,7 +109,7 @@
 
 const unsigned int kMaxDisplaySwapBuffers = 1U;
 
-#if BUILDFLAG(ENABLE_VULKAN)
+#if defined(ENABLE_VULKAN)
 scoped_refptr<cc::VulkanContextProvider> GetSharedVulkanContextProvider() {
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableVulkan)) {
@@ -305,7 +304,7 @@
   base::WeakPtrFactory<AndroidOutputSurface> weak_ptr_factory_;
 };
 
-#if BUILDFLAG(ENABLE_VULKAN)
+#if defined(ENABLE_VULKAN)
 class VulkanOutputSurface : public cc::OutputSurface {
  public:
   explicit VulkanOutputSurface(
@@ -628,7 +627,7 @@
   if (!host_->IsVisible())
     return;
 
-#if BUILDFLAG(ENABLE_VULKAN)
+#if defined(ENABLE_VULKAN)
   CreateVulkanOutputSurface()
   if (display_)
     return;
@@ -659,7 +658,7 @@
   LOG(FATAL) << "Timed out waiting for GPU channel.";
 }
 
-#if BUILDFLAG(ENABLE_VULKAN)
+#if defined(ENABLE_VULKAN)
 void CompositorImpl::CreateVulkanOutputSurface() {
   if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableVulkan))