Hookup Gpu blacklist with NaCl Pepper3D access.

content/browser/gpu/gpu_data_manager.cc

Index: content/browser/gpu/gpu_data_manager.cc
===================================================================
--- content/browser/gpu/gpu_data_manager.cc	(revision 98703)
+++ content/browser/gpu/gpu_data_manager.cc	(working copy)
@@ -21,6 +21,7 @@
 #include "content/gpu/gpu_info_collector.h"
 #include "ui/gfx/gl/gl_implementation.h"
 #include "ui/gfx/gl/gl_switches.h"
+#include "webkit/plugins/plugin_switches.h"
 
 namespace {
 
@@ -216,9 +217,12 @@
   DCHECK(command_line);
 
   uint32 flags = gpu_feature_flags_.flags();
-  if ((flags & GpuFeatureFlags::kGpuFeatureWebgl) &&
-      !command_line->HasSwitch(switches::kDisableExperimentalWebGL))
-    command_line->AppendSwitch(switches::kDisableExperimentalWebGL);
+  if ((flags & GpuFeatureFlags::kGpuFeatureWebgl)) {
+    if (!command_line->HasSwitch(switches::kDisableExperimentalWebGL))
+      command_line->AppendSwitch(switches::kDisableExperimentalWebGL);
+    if (!command_line->HasSwitch(switches::kDisablePepper3dForUntrustedUse))
+      command_line->AppendSwitch(switches::kDisablePepper3dForUntrustedUse);
+  }
   if ((flags & GpuFeatureFlags::kGpuFeatureMultisampling) &&
       !command_line->HasSwitch(switches::kDisableGLMultisampling))
     command_line->AppendSwitch(switches::kDisableGLMultisampling);