2 files changed, 5 insertions, 2 deletions
diff --git a/content/browser/gpu/gpu_data_manager.cc b/content/browser/gpu/gpu_data_manager.cc
index dc70ade..e790794 100644
--- a/content/browser/gpu/gpu_data_manager.cc
+++ b/content/browser/gpu/gpu_data_manager.cc
@@ -47,7 +47,8 @@ GpuDataManager::GpuDataManager()
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   GPUInfo gpu_info;
-  gpu_info_collector::CollectPreliminaryGraphicsInfo(&gpu_info);
+  allows_gpu_access_ =
+      gpu_info_collector::CollectPreliminaryGraphicsInfo(&gpu_info);
   UpdateGpuInfo(gpu_info);
 
 #if defined(OS_MACOSX)
@@ -142,6 +143,8 @@ GpuFeatureFlags GpuDataManager::GetGpuFeatureFlags() {
 }
 
 bool GpuDataManager::GpuAccessAllowed() {
+  if (!allows_gpu_access_)
+    return false;
   // We only need to block GPU process if more features are disallowed other
   // than those in the preliminary gpu feature flags because the latter work
   // through renderer commandline switches.
diff --git a/content/browser/gpu/gpu_data_manager.h b/content/browser/gpu/gpu_data_manager.h
index bc373ed..0243da5 100644
--- a/content/browser/gpu/gpu_data_manager.h
+++ b/content/browser/gpu/gpu_data_manager.h
@@ -99,9 +99,9 @@ class GpuDataManager {
 
   bool complete_gpu_info_already_requested_;
 
-  bool gpu_feature_flags_set_;
   GpuFeatureFlags gpu_feature_flags_;
   GpuFeatureFlags preliminary_gpu_feature_flags_;
+  bool allows_gpu_access_;
 
   GPUInfo gpu_info_;
   mutable base::Lock gpu_info_lock_;