Revert 98826 - Add means for running some tests only o-o-p. Add messaging non-main thread test.

webkit/plugins/ppapi/plugin_module.cc

 // Copyright (c) 2011 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/logging.h"
@@ skipping 182 matching lines @@
 }
 
 void QuitMessageLoop(PP_Instance instance) {
   MessageLoop::current()->QuitNow();
 }
 
 uint32_t GetLiveObjectsForInstance(PP_Instance instance_id) {
   return ResourceTracker::Get()->GetLiveObjectsForInstance(instance_id);
 }
 
-PP_Bool IsOutOfProcess() {
-  return PP_FALSE;
-}
-
 const PPB_Testing_Dev testing_interface = {
   &ReadImageData,
   &RunMessageLoop,
   &QuitMessageLoop,
-  &GetLiveObjectsForInstance,
-  &IsOutOfProcess
+  &GetLiveObjectsForInstance
 };
 
 // GetInterface ----------------------------------------------------------------
 
 const void* GetInterface(const char* name) {
   // All interfaces should be used on the main thread.
   CHECK(IsMainThread());
 
   // Allow custom interface factories first stab at the GetInterface call.
   const void* custom_interface =
@@ skipping 139 matching lines @@
 #endif  // ENABLE_FLAPPER_HACKS
 
 #if defined(ENABLE_P2P_APIS)
   if (strcmp(name, PPB_TRANSPORT_DEV_INTERFACE) == 0)
     return ::ppapi::thunk::GetPPB_Transport_Thunk();
 #endif
 
   // 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.
-  // TODO(dmichael): Remove support for 0.6. Note that 0.7 only adds a function
-  // to the end, so returning an 0.7 struct for use by clients of 0.6 just
-  // works in practice.
-  if (strcmp(name, PPB_TESTING_DEV_INTERFACE) == 0 ||
-      strcmp(name, PPB_TESTING_DEV_INTERFACE_0_6) == 0) {
+  if (strcmp(name, PPB_TESTING_DEV_INTERFACE) == 0) {
     if (CommandLine::ForCurrentProcess()->HasSwitch("enable-pepper-testing"))
       return &testing_interface;
   }
   return NULL;
 }
 
 // Gets the PPAPI entry points from the given library and places them into the
 // given structure. Returns true on success.
 bool LoadEntryPointsFromLibrary(const base::NativeLibrary& library,
                                 PluginModule::EntryPoints* entry_points) {
@@ skipping 211 matching lines @@
   int retval = entry_points.initialize_module(pp_module(), &GetInterface);
   if (retval != 0) {
     LOG(WARNING) << "PPP_InitializeModule returned failure " << retval;
     return false;
   }
   return true;
 }
 
 }  // namespace ppapi
 }  // namespace webkit