Remove OSX specific GPU info collection code

Bug: 850068
Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel
Change-Id: I8fdb2a09bb813492687ceb7c801571f1d2bd5c77
Reviewed-on: https://chromium-review.googlesource.com/1208362
Commit-Queue: Jonathan Backer <backer@chromium.org>
Reviewed-by: Zhenyao Mo <zmo@chromium.org>
Cr-Commit-Position: refs/heads/master@{#590288}

components/viz/service/gl/gpu_service_impl.cc

@@ -592,26 +592,7 @@ void GpuServiceImpl::RequestHDRStatusOnMainThread(
                        base::BindOnce(std::move(callback), hdr_enabled));
 }
 
-#if defined(OS_MACOSX)
-void GpuServiceImpl::UpdateGpuInfoPlatform(
-    base::OnceClosure on_gpu_info_updated) {
-  DCHECK(main_runner_->BelongsToCurrentThread());
-  // gpu::CollectContextGraphicsInfo() is already called during gpu process
-  // initialization (see GpuInit::InitializeAndStartSandbox()) on non-mac
-  // platforms, and during in-browser gpu thread initialization on all platforms
-  // (See InProcessGpuThread::Init()).
-  if (in_host_process())
-    return;
-
-  bool success = gpu::CollectContextGraphicsInfo(&gpu_info_, gpu_preferences_);
-  if (!success) {
-    LOG(ERROR) << "gpu::CollectGraphicsInfo failed.";
-    // TODO(piman): can we signal overall failure?
-  }
-  gpu::SetKeysForCrashLogging(gpu_info_);
-  std::move(on_gpu_info_updated).Run();
-}
-#elif defined(OS_WIN)
+#if defined(OS_WIN)
 void GpuServiceImpl::UpdateGpuInfoPlatform(
     base::OnceClosure on_gpu_info_updated) {
   DCHECK(main_runner_->BelongsToCurrentThread());

content/browser/gpu/gpu_data_manager_impl_private.cc

@@ -830,9 +830,7 @@ int64_t GpuDataManagerImplPrivate::GetBlockAllDomainsDurationInMs() const {
 }
 
 bool GpuDataManagerImplPrivate::NeedsCompleteGpuInfoCollection() const {
-#if defined(OS_MACOSX)
-  return gpu_info_.gl_vendor.empty();
-#elif defined(OS_WIN)
+#if defined(OS_WIN)
   return (gpu_info_.dx_diagnostics.values.empty() &&
           gpu_info_.dx_diagnostics.children.empty());
 #else

content/browser/gpu/gpu_data_manager_impl_private.h

@@ -168,9 +168,8 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate {
   int64_t GetBlockAllDomainsDurationInMs() const;
 
   // This is platform specific. At the moment:
-  //   1) on MacOSX, if GL strings are missing, this returns true;
-  //   2) on Windows, if DxDiagnostics are missing, this returns true;
-  //   3) all other platforms, this returns false.
+  //   1) on Windows, if DxDiagnostics are missing, this returns true;
+  //   2) all other platforms, this returns false.
   bool NeedsCompleteGpuInfoCollection() const;
 
   GpuDataManagerImpl* const owner_;