gpu: Replace GpuMsg_CollectGraphicsInfo with mojom API.

content/gpu/gpu_child_thread.cc

 // Copyright (c) 2012 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/gpu/gpu_child_thread.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 229 matching lines @@
   // The GPU process must never send a synchronous IPC message to the browser
   // process. This could result in deadlock.
   DCHECK(!msg->is_sync());
 
   return ChildThreadImpl::Send(msg);
 }
 
 bool GpuChildThread::OnControlMessageReceived(const IPC::Message& msg) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(GpuChildThread, msg)
-    IPC_MESSAGE_HANDLER(GpuMsg_CollectGraphicsInfo, OnCollectGraphicsInfo)
     IPC_MESSAGE_HANDLER(GpuMsg_GpuSwitched, OnGpuSwitched)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
 
   return handled;
 }
 
 bool GpuChildThread::OnMessageReceived(const IPC::Message& msg) {
   if (ChildThreadImpl::OnMessageReceived(msg))
     return true;
@@ skipping 16 matching lines @@
     associated_interfaces_.BindRequest(name, std::move(handle));
   else
     ChildThreadImpl::OnAssociatedInterfaceRequest(name, std::move(handle));
 }
 
 void GpuChildThread::CreateGpuService(
     ui::mojom::GpuServiceRequest request,
     ui::mojom::GpuHostPtr gpu_host,
     const gpu::GpuPreferences& gpu_preferences,
     mojo::ScopedSharedBufferHandle activity_flags) {
+  gpu_service_->set_in_host_process(in_browser_process_);
   gpu_service_->Bind(std::move(request));
 
   gpu_info_.video_decode_accelerator_capabilities =
       media::GpuVideoDecodeAccelerator::GetCapabilities(gpu_preferences);
   gpu_info_.video_encode_accelerator_supported_profiles =
       media::GpuVideoEncodeAccelerator::GetSupportedProfiles(gpu_preferences);
   gpu_info_.jpeg_decode_accelerator_supported =
       media::GpuJpegDecodeAcceleratorFactoryProvider::
           IsAcceleratedJpegDecodeSupported();
 
@@ skipping 45 matching lines @@
 
   GetInterfaceRegistry()->ResumeBinding();
 }
 
 void GpuChildThread::CreateDisplayCompositor(
     cc::mojom::DisplayCompositorRequest request,
     cc::mojom::DisplayCompositorClientPtr client) {
   NOTREACHED();
 }
 
-void GpuChildThread::OnCollectGraphicsInfo() {
-  if (dead_on_arrival_)
-    return;
-
-#if defined(OS_MACOSX)
-  // 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_browser_process_) {
-    DCHECK_EQ(gpu::kCollectInfoNone, gpu_info_.context_info_state);
-    gpu::CollectInfoResult result = gpu::CollectContextGraphicsInfo(&gpu_info_);
-    switch (result) {
-      case gpu::kCollectInfoFatalFailure:
-        LOG(ERROR) << "gpu::CollectGraphicsInfo failed (fatal).";
-        // TODO(piman): can we signal overall failure?
-        break;
-      case gpu::kCollectInfoNonFatalFailure:
-        DVLOG(1) << "gpu::CollectGraphicsInfo failed (non-fatal).";
-        break;
-      case gpu::kCollectInfoNone:
-        NOTREACHED();
-        break;
-      case gpu::kCollectInfoSuccess:
-        break;
-    }
-    GetContentClient()->SetGpuInfo(gpu_info_);
-  }
-#endif
-
-#if defined(OS_WIN)
-  // GPU full info collection should only happen on un-sandboxed GPU process
-  // or single process/in-process gpu mode on Windows.
-  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
-  DCHECK(command_line->HasSwitch(switches::kDisableGpuSandbox) ||
-         in_browser_process_);
-
-  // This is slow, but it's the only thing the unsandboxed GPU process does,
-  // and GpuDataManager prevents us from sending multiple collecting requests,
-  // so it's OK to be blocking.
-  gpu::GetDxDiagnostics(&gpu_info_.dx_diagnostics);
-  gpu_info_.dx_diagnostics_info_state = gpu::kCollectInfoSuccess;
-#endif  // OS_WIN
-
-  Send(new GpuHostMsg_GraphicsInfoCollected(gpu_info_));
-
-#if defined(OS_WIN)
-  if (!in_browser_process_) {
-    // The unsandboxed GPU process fulfilled its duty.  Rest in peace.
-    base::MessageLoop::current()->QuitWhenIdle();
-  }
-#endif  // OS_WIN
-}
-
 void GpuChildThread::OnGpuSwitched() {
   DVLOG(1) << "GPU: GPU has switched";
   // Notify observers in the GPU process.
   if (!in_browser_process_)
     ui::GpuSwitchingManager::GetInstance()->NotifyGpuSwitched();
 }
 
 void GpuChildThread::OnDestroyGpuMemoryBuffer(
     gfx::GpuMemoryBufferId id,
     int client_id,
     const gpu::SyncToken& sync_token) {
   if (gpu_channel_manager())
     gpu_channel_manager()->DestroyGpuMemoryBuffer(id, client_id, sync_token);
 }
 
 void GpuChildThread::BindServiceFactoryRequest(
     service_manager::mojom::ServiceFactoryRequest request) {
   DVLOG(1) << "GPU: Binding service_manager::mojom::ServiceFactoryRequest";
   DCHECK(service_factory_);
   service_factory_bindings_.AddBinding(service_factory_.get(),
                                        std::move(request));
 }
 
 }  // namespace content