(Re-landing http://codereview.chromium.org/5991003)

webkit/plugins/ppapi/plugin_module.cc

 // Copyright (c) 2010 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 "webkit/plugins/ppapi/plugin_module.h"
 
 #include <set>
 
 #include "base/command_line.h"
 #include "base/message_loop.h"
@@ skipping 260 matching lines @@
   if (strcmp(name, PPB_VAR_INTERFACE) == 0)
     return Var::GetInterface();
   if (strcmp(name, PPB_VIDEODECODER_DEV_INTERFACE) == 0)
     return PPB_VideoDecoder_Impl::GetInterface();
   if (strcmp(name, PPB_WIDGET_DEV_INTERFACE) == 0)
     return PPB_Widget_Impl::GetInterface();
   if (strcmp(name, PPB_ZOOM_DEV_INTERFACE) == 0)
     return PluginInstance::GetZoomInterface();
 
 #ifdef ENABLE_GPU
-  if (strcmp(name, PPB_GRAPHICS_3D_DEV_INTERFACE) == 0)
-    return PPB_Graphics3D_Impl::GetInterface();
-  if (strcmp(name, PPB_OPENGLES_DEV_INTERFACE) == 0)
-    return PPB_Graphics3D_Impl::GetOpenGLESInterface();
+  // This should really refer to switches::kDisable3DAPIs.
+  if (!CommandLine::ForCurrentProcess()->HasSwitch("disable-3d-apis")) {
+    if (strcmp(name, PPB_GRAPHICS_3D_DEV_INTERFACE) == 0)
+      return PPB_Graphics3D_Impl::GetInterface();
+    if (strcmp(name, PPB_OPENGLES_DEV_INTERFACE) == 0)
+      return PPB_Graphics3D_Impl::GetOpenGLESInterface();
+  }
 #endif  // ENABLE_GPU
 
   // Only support the testing interface when the command line switch is
   // specified. This allows us to prevent people from (ab)using this interface
   // in production code.
   if (strcmp(name, PPB_TESTING_DEV_INTERFACE) == 0) {
     if (CommandLine::ForCurrentProcess()->HasSwitch("enable-pepper-testing"))
       return &testing_interface;
   }
   return NULL;
@@ skipping 198 matching lines @@
   if (retval != 0) {
     LOG(WARNING) << "PPP_InitializeModule returned failure " << retval;
     return false;
   }
   return true;
 }
 
 }  // namespace ppapi
 }  // namespace webkit