Assert sequence validity on non-thread-safe RefCount manipulations (2)

content/browser/gpu/gpu_data_manager_impl.cc

Index: content/browser/gpu/gpu_data_manager_impl.cc
diff --git a/content/browser/gpu/gpu_data_manager_impl.cc b/content/browser/gpu/gpu_data_manager_impl.cc
index e3bd1e5cc9930ab21f41b9e9b37286016d4da0d4..2e9247ce239016bbd734cbfc40fab489e149b67b 100644
--- a/content/browser/gpu/gpu_data_manager_impl.cc
+++ b/content/browser/gpu/gpu_data_manager_impl.cc
@@ -22,6 +22,10 @@ GpuDataManagerImpl* GpuDataManagerImpl::GetInstance() {
 void GpuDataManagerImpl::InitializeForTesting(
     const std::string& gpu_blacklist_json, const gpu::GPUInfo& gpu_info) {
   base::AutoLock auto_lock(lock_);
+  // Relax the cross-thread access restriction to non-thread-safe RefCount.
+  // See the comment in Initialize().
+  base::ScopedAllowCrossThreadRefCountAccess
+      allow_cross_thread_ref_count_access;
   private_->InitializeForTesting(gpu_blacklist_json, gpu_info);
 }
 
@@ -141,11 +145,20 @@ void GpuDataManagerImpl::SetGpuInfo(const gpu::GPUInfo& gpu_info) {
 
 void GpuDataManagerImpl::Initialize() {
   base::AutoLock auto_lock(lock_);
+  // Relax the cross-thread access restriction to non-thread-safe RefCount.
+  // GpuDataManagerImplPrivate has GpuControlLists, which touches
+  // non-thread-safe GpuControlListEntry RefCount in the lock.
+  base::ScopedAllowCrossThreadRefCountAccess
+      allow_cross_thread_ref_count_access;
   private_->Initialize();
 }
 
 void GpuDataManagerImpl::UpdateGpuInfo(const gpu::GPUInfo& gpu_info) {
   base::AutoLock auto_lock(lock_);
+  // Relax the cross-thread access restriction to non-thread-safe RefCount.
+  // See the comment in Initialize().
+  base::ScopedAllowCrossThreadRefCountAccess
+      allow_cross_thread_ref_count_access;
   private_->UpdateGpuInfo(gpu_info);
 }
 
@@ -251,6 +264,10 @@ size_t GpuDataManagerImpl::GetBlacklistedFeatureCount() const {
 bool GpuDataManagerImpl::UpdateActiveGpu(uint32_t vendor_id,
                                          uint32_t device_id) {
   base::AutoLock auto_lock(lock_);
+  // Relax the cross-thread access restriction to non-thread-safe RefCount.
+  // See the comment in Initialize().
+  base::ScopedAllowCrossThreadRefCountAccess
+      allow_cross_thread_ref_count_access;
   return private_->UpdateActiveGpu(vendor_id, device_id);
 }