gpu: Replace GpuMsg_CollectGraphicsInfo with mojom API.

content/browser/gpu/gpu_data_manager_impl_private.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/gpu/gpu_data_manager_impl_private.h"
 
 #include <algorithm>
 #include <iterator>
 #include <memory>
 #include <utility>
@@ skipping 264 matching lines @@
   GpuDataManagerImpl::GetInstance()->UpdateVideoMemoryUsageStats(stats);
 }
 
 void RequestVideoMemoryUsageStats(GpuProcessHost* host) {
   if (!host)
     return;
   host->gpu_service()->GetVideoMemoryUsageStats(
       base::Bind(&OnVideoMemoryUsageStats));
 }
 
+void UpdateGpuInfoOnIO(const gpu::GPUInfo& gpu_info) {
+  // This function is called on the IO thread, but GPUInfo on GpuDataManagerImpl
+  // should be updated on the UI thread (since it can call into functions that
+  // expect to run in the UI thread, e.g. ContentClient::SetGpuInfo()).
+  BrowserThread::PostTask(
+      BrowserThread::UI, FROM_HERE,
+      base::Bind(
+          [](const gpu::GPUInfo& gpu_info) {
+            TRACE_EVENT0("test_gpu", "OnGraphicsInfoCollected");
+            GpuDataManagerImpl::GetInstance()->UpdateGpuInfo(gpu_info);
+          },
+          gpu_info));
+}
+
 }  // namespace anonymous
 
 void GpuDataManagerImplPrivate::InitializeForTesting(
     const std::string& gpu_blacklist_json,
     const gpu::GPUInfo& gpu_info) {
   // This function is for testing only, so disable histograms.
   update_histograms_ = false;
 
   // Prevent all further initialization.
   finalized_ = true;
@@ skipping 116 matching lines @@
 
 void GpuDataManagerImplPrivate::RequestCompleteGpuInfoIfNeeded() {
   if (complete_gpu_info_already_requested_ || IsCompleteGpuInfoAvailable() ||
       base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kGpuTestingNoCompleteInfoCollection)) {
     return;
   }
 
   complete_gpu_info_already_requested_ = true;
 
-  GpuProcessHost::SendOnIO(
+  GpuProcessHost::CallOnIO(
 #if defined(OS_WIN)
       GpuProcessHost::GPU_PROCESS_KIND_UNSANDBOXED,
 #else
       GpuProcessHost::GPU_PROCESS_KIND_SANDBOXED,
 #endif
-      true /* force_create */, new GpuMsg_CollectGraphicsInfo());
+      true /* force_create */, base::Bind([](GpuProcessHost* host) {
+        if (!host)
+          return;
+        host->gpu_service()->RequestCompleteGpuInfo(
+            base::Bind(&UpdateGpuInfoOnIO));
+      }));
 }
 
 bool GpuDataManagerImplPrivate::IsEssentialGpuInfoAvailable() const {
   if (gpu_info_.basic_info_state == gpu::kCollectInfoNone ||
       gpu_info_.context_info_state == gpu::kCollectInfoNone) {
     return false;
   }
   return true;
 }
 
@@ skipping 924 matching lines @@
   gpu_info_.context_info_state = gpu::kCollectInfoFatalFailure;
 #if defined(OS_WIN)
   gpu_info_.dx_diagnostics_info_state = gpu::kCollectInfoFatalFailure;
 #endif
   complete_gpu_info_already_requested_ = true;
   // Some observers might be waiting.
   NotifyGpuInfoUpdate();
 }
 
 }  // namespace content