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 400 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([](const gpu::GPUInfo& gpu_info) {
+              TRACE_EVENT0("test_gpu", "OnGraphicsInfoCollected");
+              GpuDataManagerImpl::GetInstance()->UpdateGpuInfo(gpu_info);

[piman, 2017/03/20 21:02:36]

Should we hop back to the UI thread, though?
I know there's a lock around accesses to GpuDataManagerImplPrivate, but 
GpuDataManagerImplPrivate::UpdateGpuInfo calls back into things (e.g. 
GetContentClient()->SetGpuInfo ) which I'm not sure is safe to do from the IO
thread.

[sadrul, 2017/03/20 21:21:44]

Ah, that's a good point! I have moved this to hop onto the UI thread before
updating GPUInfo.

Would it make sense to add some DCHECKs into GpuDataManager[Impl[Private]] to
make sure such functions are called from the right thread (where applicable) to
avoid accidental regressions?

[piman, 2017/03/20 21:33:54]

I think it would be useful. GpuDataManagerImplPrivate is a bit of a mess and not
necessarily well behaved everywhere. It "looks" thread-safe for the most part,
but I think it's not in several places (UpdateGpuInfo being one).

+            }));
+      }));
 }
 
 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