Connect up flash blacklist entries to GetSettingInt

content/browser/web_contents/web_contents_impl.cc

Index: content/browser/web_contents/web_contents_impl.cc
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 218f6f9d066709a353cf833648bbba9615198971..ae2fa0dd4d5ecd5695ac7b4d9a4c544f96fd411f 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -428,6 +428,9 @@ WebPreferences WebContentsImpl::GetWebkitPrefs(RenderViewHost* rvh,
       !command_line.HasSwitch(switches::kDisable3DAPIs) &&
       !command_line.HasSwitch(switches::kDisableExperimentalWebGL);
 
+  prefs.flash_3d_enabled = prefs.flash_stage3d_enabled =
+      GpuProcessHost::gpu_enabled();
+
   prefs.gl_multisampling_enabled =
       !command_line.HasSwitch(switches::kDisableGLMultisampling);
   prefs.privileged_webgl_extensions_enabled =
@@ -509,6 +512,10 @@ WebPreferences WebContentsImpl::GetWebkitPrefs(RenderViewHost* rvh,
       prefs.accelerated_compositing_enabled = false;
     if (blacklist_type & content::GPU_FEATURE_TYPE_WEBGL)
       prefs.experimental_webgl_enabled = false;
+    if (blacklist_type & content::GPU_FEATURE_TYPE_FLASH3D)
+      prefs.flash_3d_enabled = false;
+    if (blacklist_type & content::GPU_FEATURE_TYPE_FLASH_STAGE3D)
+      prefs.flash_stage3d_enabled = false;
     if (blacklist_type & content::GPU_FEATURE_TYPE_ACCELERATED_2D_CANVAS)
       prefs.accelerated_2d_canvas_enabled = false;
     if (blacklist_type & content::GPU_FEATURE_TYPE_MULTISAMPLING)