Rename the command line switch for disabling DX12/Vulkan info collection

We no longer collect Vulkan info for UMA at the browser start. Rename
command line switch to DX12 only. This switch is mainly used for testing.

Change --disable-gpu-process-for-dx12-vulkan-info-collection to
--disable-gpu-process-for-dx12-info-collection
and
Change kDisableGpuProcessForDX12VulkanInfoCollection[] to
kDisableGpuProcessForDX12InfoCollection[]

Bug: 775983
Change-Id: Iddbac1fb81cddce16df8910109fba1b6ddfb8089
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2280587Reviewed-by: Zhenyao Mo <zmo@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Commit-Queue: Maggie Chen <magchen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#787850}

content/browser/devtools/protocol/system_info_handler.cc

@@ -302,7 +302,7 @@ class SystemInfoHandlerGpuObserver : public content::GpuDataManagerObserver {
     base::CommandLine* command = base::CommandLine::ForCurrentProcess();
     // Only wait for DX12/Vulkan info if requested at Chrome start up.
     if (!command->HasSwitch(
-            switches::kDisableGpuProcessForDX12VulkanInfoCollection) &&
+            switches::kDisableGpuProcessForDX12InfoCollection) &&
         command->HasSwitch(switches::kNoDelayForDX12VulkanInfoCollection) &&
         !GpuDataManagerImpl::GetInstance()->IsDx12VulkanVersionAvailable())
       return;

content/browser/gpu/gpu_data_manager_impl_private.cc

@@ -717,7 +717,7 @@ void GpuDataManagerImplPrivate::RequestGpuSupportedDx12Version(bool delayed) {
         base::CommandLine* command_line =
             base::CommandLine::ForCurrentProcess();
         if (command_line->HasSwitch(
-                switches::kDisableGpuProcessForDX12VulkanInfoCollection)) {
+                switches::kDisableGpuProcessForDX12InfoCollection)) {
           manager->UpdateDx12RequestStatus(false);
           return;
         }
@@ -778,14 +778,6 @@ void GpuDataManagerImplPrivate::RequestGpuSupportedVulkanVersion(bool delayed) {
         if (manager->VulkanRequested())
           return;
 
-        base::CommandLine* command_line =
-            base::CommandLine::ForCurrentProcess();
-        if (command_line->HasSwitch(
-                switches::kDisableGpuProcessForDX12VulkanInfoCollection)) {
-          manager->UpdateVulkanRequestStatus(false);
-          return;
-        }
-
         // No info collection for software GL implementation (id == 0xffff) or
         // abnormal situation (id == 0). There are a few crash reports on
         // exit_or_terminate_process() during process teardown. The GPU ID

content/public/test/browser_test_base.cc

@@ -362,11 +362,9 @@ void BrowserTestBase::SetUp() {
                                     disabled_features);
   }
 
-  // Always disable the unsandbox GPU process for DX12 and Vulkan Info
-  // collection to avoid interference. This GPU process is launched 120
-  // seconds after chrome starts.
-  command_line->AppendSwitch(
-      switches::kDisableGpuProcessForDX12VulkanInfoCollection);
+  // Always disable the unsandbox GPU process for DX12 Info collection to avoid
+  // interference. This GPU process is launched 120 seconds after chrome starts.
+  command_line->AppendSwitch(switches::kDisableGpuProcessForDX12InfoCollection);
 
   // The current global field trial list contains any trials that were activated
   // prior to main browser startup. That global field trial list is about to be

content/public/test/test_launcher.cc

@@ -266,11 +266,9 @@ bool WrapperTestLauncherDelegate::ShouldRunTest(
 void AppendCommandLineSwitches() {
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
 
-  // Always disable the unsandbox GPU process for DX12 and Vulkan Info
-  // collection to avoid interference. This GPU process is launched 120
-  // seconds after chrome starts.
-  command_line->AppendSwitch(
-      switches::kDisableGpuProcessForDX12VulkanInfoCollection);
+  // Always disable the unsandbox GPU process for DX12 Info collection to avoid
+  // interference. This GPU process is launched 120 seconds after chrome starts.
+  command_line->AppendSwitch(switches::kDisableGpuProcessForDX12InfoCollection);
 }
 
 }  // namespace

content/shell/browser/web_test/web_test_browser_main_runner.cc

@@ -132,11 +132,9 @@ void WebTestBrowserMainRunner::Initialize() {
   command_line.AppendSwitch(
       switches::kDisableBackgroundingOccludedWindowsForTesting);
 
-  // Always disable the unsandbox GPU process for DX12 and Vulkan Info
-  // collection to avoid interference. This GPU process is launched 120
-  // seconds after chrome starts.
-  command_line.AppendSwitch(
-      switches::kDisableGpuProcessForDX12VulkanInfoCollection);
+  // Always disable the unsandbox GPU process for DX12 Info collection to avoid
+  // interference. This GPU process is launched 120 seconds after chrome starts.
+  command_line.AppendSwitch(switches::kDisableGpuProcessForDX12InfoCollection);
 
 #if BUILDFLAG(ENABLE_PLUGINS)
   bool ppapi_ok = ppapi::RegisterBlinkTestPlugin(&command_line);
@@ -217,11 +215,9 @@ void WebTestBrowserMainRunner::Initialize() {
   // Enable the deprecated WebAuthn Mojo Testing API.
   command_line.AppendSwitch(switches::kEnableWebAuthDeprecatedMojoTestingApi);
 
-  // Always disable the unsandbox GPU process for DX12 and Vulkan Info
-  // collection to avoid interference. This GPU process is launched 120
-  // seconds after chrome starts.
-  command_line.AppendSwitch(
-      switches::kDisableGpuProcessForDX12VulkanInfoCollection);
+  // Always disable the unsandbox GPU process for DX12 Info collection to avoid
+  // interference. This GPU process is launched 120 seconds after chrome starts.
+  command_line.AppendSwitch(switches::kDisableGpuProcessForDX12InfoCollection);
 
 #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
   content::WebTestBrowserPlatformInitialize();

gpu/config/gpu_switches.cc

@@ -34,9 +34,9 @@ const char kIgnoreGpuBlacklist[] = "ignore-gpu-blacklist";
 // devices.
 const char kShaderDiskCacheSizeKB[] = "shader-disk-cache-size-kb";
 
-// Disables the non-sandboxed GPU process for DX12 and Vulkan info collection
-const char kDisableGpuProcessForDX12VulkanInfoCollection[] =
-    "disable-gpu-process-for-dx12-vulkan-info-collection";
+// Disables the non-sandboxed GPU process for DX12 info collection
+const char kDisableGpuProcessForDX12InfoCollection[] =
+    "disable-gpu-process-for-dx12-info-collection";
 
 const char kEnableUnsafeWebGPU[] = "enable-unsafe-webgpu";
 

gpu/config/gpu_switches.h

@@ -16,7 +16,7 @@ GPU_EXPORT extern const char kGpuDriverBugListTestGroup[];
 GPU_EXPORT extern const char kGpuPreferences[];
 GPU_EXPORT extern const char kIgnoreGpuBlacklist[];
 GPU_EXPORT extern const char kShaderDiskCacheSizeKB[];
-GPU_EXPORT extern const char kDisableGpuProcessForDX12VulkanInfoCollection[];
+GPU_EXPORT extern const char kDisableGpuProcessForDX12InfoCollection[];
 GPU_EXPORT extern const char kEnableUnsafeWebGPU[];
 GPU_EXPORT extern const char kEnableDawnBackendValidation[];
 GPU_EXPORT extern const char kUseHighGPUThreadPriorityForPerfTests[];

headless/lib/headless_content_main_delegate.cc

@@ -233,7 +233,7 @@ bool HeadlessContentMainDelegate::BasicStartupComplete(int* exit_code) {
 
 #if defined(OS_WIN)
   command_line->AppendSwitch(
-      ::switches::kDisableGpuProcessForDX12VulkanInfoCollection);
+      ::switches::kDisableGpuProcessForDX12InfoCollection);
 #endif
 
   content::Profiling::ProcessStarted();

tools/perf/core/perf_benchmark.py

@@ -110,7 +110,7 @@ class PerfBenchmark(benchmark.Benchmark):
     # skip this gpu process for all perf tests to prevent any interference
     # with the test results.
     browser_options.AppendExtraBrowserArgs(
-        '--disable-gpu-process-for-dx12-vulkan-info-collection')
+        '--disable-gpu-process-for-dx12-info-collection')
 
     self.SetExtraBrowserOptions(browser_options)