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

content/browser/gpu/gpu_data_manager_impl.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.h"
 
 #include "content/browser/gpu/gpu_data_manager_impl_private.h"
 #include "gpu/ipc/common/memory_stats.h"
 
 namespace content {
 
 // static
 GpuDataManager* GpuDataManager::GetInstance() {
   return GpuDataManagerImpl::GetInstance();
 }
 
 // static
 GpuDataManagerImpl* GpuDataManagerImpl::GetInstance() {
   return base::Singleton<GpuDataManagerImpl>::get();
 }
 
 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);
 }
 
 bool GpuDataManagerImpl::IsFeatureBlacklisted(int feature) const {
   base::AutoLock auto_lock(lock_);
   return private_->IsFeatureBlacklisted(feature);
 }
 
 bool GpuDataManagerImpl::IsFeatureEnabled(int feature) const {
   base::AutoLock auto_lock(lock_);
@@ skipping 104 matching lines @@
   private_->GetDisabledExtensions(disabled_extensions);
 }
 
 void GpuDataManagerImpl::SetGpuInfo(const gpu::GPUInfo& gpu_info) {
   base::AutoLock auto_lock(lock_);
   private_->SetGpuInfo(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);
 }
 
 void GpuDataManagerImpl::UpdateGpuFeatureInfo(
     const gpu::GpuFeatureInfo& gpu_feature_info) {
   base::AutoLock auto_lock(lock_);
   private_->UpdateGpuFeatureInfo(gpu_feature_info);
 }
 
 void GpuDataManagerImpl::UpdateVideoMemoryUsageStats(
@@ skipping 85 matching lines @@
 }
 
 size_t GpuDataManagerImpl::GetBlacklistedFeatureCount() const {
   base::AutoLock auto_lock(lock_);
   return private_->GetBlacklistedFeatureCount();
 }
 
 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);
 }
 
 void GpuDataManagerImpl::Notify3DAPIBlocked(const GURL& top_origin_url,
                                             int render_process_id,
                                             int render_frame_id,
                                             ThreeDAPIType requester) {
   base::AutoLock auto_lock(lock_);
   private_->Notify3DAPIBlocked(
       top_origin_url, render_process_id, render_frame_id, requester);
 }
 
 void GpuDataManagerImpl::OnGpuProcessInitFailure() {
   base::AutoLock auto_lock(lock_);
   private_->OnGpuProcessInitFailure();
 }
 
 GpuDataManagerImpl::GpuDataManagerImpl()
     : private_(GpuDataManagerImplPrivate::Create(this)) {
 }
 
 GpuDataManagerImpl::~GpuDataManagerImpl() {
 }
 
 }  // namespace content