gpu:: Remove GpuDataManagerObserver::OnVideoMemoryUsageStatsUpdate().

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 246 matching lines @@
   BLOCK_STATUS_SPECIFIC_DOMAIN_BLOCKED,
   BLOCK_STATUS_ALL_DOMAINS_BLOCKED,
   BLOCK_STATUS_MAX
 };
 
 bool ShouldDisableHardwareAcceleration() {
   return base::CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kDisableGpu);
 }
 
-void OnVideoMemoryUsageStats(const gpu::VideoMemoryUsageStats& stats) {
-  GpuDataManagerImpl::GetInstance()->UpdateVideoMemoryUsageStats(stats);
+void OnVideoMemoryUsageStats(
+    const base::Callback<void(const gpu::VideoMemoryUsageStats& stats)>&
+        callback,
+    const gpu::VideoMemoryUsageStats& stats) {
+  BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
+                          base::Bind(callback, stats));
 }
 
-void RequestVideoMemoryUsageStats(GpuProcessHost* host) {
+void RequestVideoMemoryUsageStats(
+    const base::Callback<void(const gpu::VideoMemoryUsageStats& stats)>&
+        callback,
+    GpuProcessHost* host) {
   if (!host)
     return;
   host->gpu_service()->GetVideoMemoryUsageStats(
-      base::Bind(&OnVideoMemoryUsageStats));
+      base::Bind(&OnVideoMemoryUsageStats, callback));
 }
 
 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) {
@@ skipping 157 matching lines @@
 }
 
 bool GpuDataManagerImplPrivate::IsCompleteGpuInfoAvailable() const {
 #if defined(OS_WIN)
   if (gpu_info_.dx_diagnostics_info_state == gpu::kCollectInfoNone)
     return false;
 #endif
   return IsEssentialGpuInfoAvailable();
 }
 
-void GpuDataManagerImplPrivate::RequestVideoMemoryUsageStatsUpdate() const {
+void GpuDataManagerImplPrivate::RequestVideoMemoryUsageStatsUpdate(
+    const base::Callback<void(const gpu::VideoMemoryUsageStats& stats)>&
+        callback) const {
   GpuProcessHost::CallOnIO(GpuProcessHost::GPU_PROCESS_KIND_SANDBOXED,
                            false /* force_create */,
-                           base::Bind(&RequestVideoMemoryUsageStats));
+                           base::Bind(&RequestVideoMemoryUsageStats, callback));
 }
 
 bool GpuDataManagerImplPrivate::ShouldUseSwiftShader() const {
   return use_swiftshader_;
 }
 
 void GpuDataManagerImplPrivate::AddObserver(GpuDataManagerObserver* observer) {
   GpuDataManagerImpl::UnlockedSession session(owner_);
   observer_list_->AddObserver(observer);
 }
@@ skipping 239 matching lines @@
   UpdateGpuInfoHelper();
 }
 
 void GpuDataManagerImplPrivate::UpdateGpuFeatureInfo(
     const gpu::GpuFeatureInfo& gpu_feature_info) {
   if (!use_swiftshader_) {
     gpu_feature_info_ = gpu_feature_info;
   }
 }
 
-void GpuDataManagerImplPrivate::UpdateVideoMemoryUsageStats(
-    const gpu::VideoMemoryUsageStats& video_memory_usage_stats) {
-  GpuDataManagerImpl::UnlockedSession session(owner_);
-  observer_list_->Notify(FROM_HERE,
-                         &GpuDataManagerObserver::OnVideoMemoryUsageStatsUpdate,
-                         video_memory_usage_stats);
-}
-
 void GpuDataManagerImplPrivate::AppendRendererCommandLine(
     base::CommandLine* command_line) const {
   DCHECK(command_line);
 
   if (ShouldDisableAcceleratedVideoDecode(command_line))
     command_line->AppendSwitch(switches::kDisableAcceleratedVideoDecode);
 #if BUILDFLAG(ENABLE_WEBRTC)
   if (IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_ENCODE) &&
       !command_line->HasSwitch(switches::kDisableWebRtcHWVP8Encoding))
     command_line->AppendSwitch(switches::kDisableWebRtcHWVP8Encoding);
@@ skipping 673 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