Add a command line switch to enable the pepper testing interface. This moves ...

webkit/glue/plugins/pepper_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/glue/plugins/pepper_plugin_module.h"
 
 #include <set>
 
+#include "base/command_line.h"
 #include "base/message_loop_proxy.h"
 #include "base/logging.h"
 #include "base/scoped_ptr.h"
 #include "base/time.h"
 #include "third_party/ppapi/c/ppb_core.h"
 #include "third_party/ppapi/c/ppb_device_context_2d.h"
 #include "third_party/ppapi/c/ppb_image_data.h"
 #include "third_party/ppapi/c/ppb_instance.h"
 #include "third_party/ppapi/c/ppb_testing.h"
 #include "third_party/ppapi/c/ppb_var.h"
@@ skipping 100 matching lines @@
   if (strcmp(name, PPB_CORE_INTERFACE) == 0)
     return &core_interface;
   if (strcmp(name, PPB_VAR_INTERFACE) == 0)
     return GetVarInterface();
   if (strcmp(name, PPB_INSTANCE_INTERFACE) == 0)
     return PluginInstance::GetInterface();
   if (strcmp(name, PPB_IMAGEDATA_INTERFACE) == 0)
     return ImageData::GetInterface();
   if (strcmp(name, PPB_DEVICECONTEXT2D_INTERFACE) == 0)
     return DeviceContext2D::GetInterface();
-  if (strcmp(name, PPB_TESTING_INTERFACE) == 0)
-    return &testing_interface;
+
+  // 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_INTERFACE) == 0) {
+    if (CommandLine::ForCurrentProcess()->HasSwitch("enable-pepper-testing"))

[Nico, 2011/08/30 20:22:23]

Why not kEnablePepperTesting?

(Asking because I was just searching for places where kEnablePepperTesting was
read, and I didn't find anything.)

[brettw, 2011/08/30 23:10:41]

I think at the time of this patch there was no shared place for switches for
this code. I added one a while ago so I should be able to convert this over now.

+      return &testing_interface;
+  }
   return NULL;
 }
 
 }  // namespace
 
 PluginModule::PluginModule(const FilePath& filename)
     : filename_(filename),
       initialized_(false),
       library_(0),
       ppp_get_interface_(NULL) {
@@ skipping 105 matching lines @@
 
 void PluginModule::InstanceCreated(PluginInstance* instance) {
   instances_.insert(instance);
 }
 
 void PluginModule::InstanceDeleted(PluginInstance* instance) {
   instances_.erase(instance);
 }
 
 }  // namespace pepper