Remove untrusted scripting support.

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/message_loop.h"
@@ skipping 377 matching lines @@
     return ::ppapi::thunk::GetPPB_Messaging_Thunk();
   if (strcmp(name, PPB_URLLOADER_INTERFACE_0_2) == 0)
     return ::ppapi::thunk::GetPPB_URLLoader_Thunk();
   if (strcmp(name, PPB_URLREQUESTINFO_INTERFACE_0_2) == 0)
     return ::ppapi::thunk::GetPPB_URLRequestInfo_Thunk();
   if (strcmp(name, PPB_URLRESPONSEINFO_INTERFACE_0_1) == 0)
     return ::ppapi::thunk::GetPPB_URLResponseInfo_Thunk();
   if (strcmp(name, PPB_VAR_INTERFACE_0_5) == 0)
     return Var::GetInterface();
 
-  // Support the 0.4 version of PPB_Instance that includes scripting, until it
-  // is no longer being used.
-  // TODO(dmichael): Remove this.
-  if (strcmp(name, PPB_INSTANCE_INTERFACE_0_4) == 0)
-    return ::ppapi::thunk::GetPPB_Instance_0_4_Thunk();
-
   // Support the dev interfaces for file io, fileref and file system
   // until relevant tests and examples are migrated over to non-dev interfaces
   // in order to prevent breaking the tests and examples.
   // TODO(sanga): Remove support for these dev interfaces once the relevant
   // tests and examples are migrated to non-dev interfaces.
   const bool support_dev_file_interfaces = true;
   if (support_dev_file_interfaces) {
     if (strcmp(name, "PPB_FileIO(Dev);0.4") == 0)
       return ::ppapi::thunk::GetPPB_FileIO_Thunk();
     if (strcmp(name, "PPB_FileIOTrusted(Dev);0.3") == 0)
@@ skipping 140 matching lines @@
 // static
 PluginModule::GetInterfaceFunc PluginModule::GetLocalGetInterfaceFunc() {
   return &GetInterface;
 }
 
 PluginInstance* PluginModule::CreateInstance(PluginDelegate* delegate) {
   PluginInstance* instance(NULL);
   const void* ppp_instance = GetPluginInterface(PPP_INSTANCE_INTERFACE_0_5);
   if (ppp_instance) {
     instance = PluginInstance::Create0_5(delegate, this, ppp_instance);
-  } else {
-    // If the 0.5 interface is not supported, try retrieving 0.4.
-    ppp_instance = GetPluginInterface(PPP_INSTANCE_INTERFACE_0_4);
-    if (ppp_instance)
-      instance = PluginInstance::Create0_4(delegate, this, ppp_instance);
   }
   if (!instance) {
     LOG(WARNING) << "Plugin doesn't support instance interface, failing.";
     return NULL;
   }
   if (out_of_process_proxy_.get())
     out_of_process_proxy_->AddInstance(instance->pp_instance());
   return instance;
 }
 
@@ skipping 73 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