Revert "PPAPI: Make GetProxiedInterface not re-enter the plugin"

ppapi/proxy/ppapi_proxy_test.cc

 // Copyright (c) 2012 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 "ppapi/proxy/ppapi_proxy_test.h"
 
 #include <sstream>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 104 matching lines @@
 
 const void* ProxyTestHarnessBase::GetInterface(const char* name) {
   return registered_interfaces_[name];
 }
 
 void ProxyTestHarnessBase::RegisterTestInterface(const char* name,
                                                  const void* test_interface) {
   registered_interfaces_[name] = test_interface;
 }
 
-bool ProxyTestHarnessBase::IsInterfaceSupported(const char* name) {
+bool ProxyTestHarnessBase::SupportsInterface(const char* name) {
   sink().ClearMessages();
 
   // IPC doesn't actually write to this when we send a message manually
   // not actually using IPC.
   bool unused_result = false;
-  PpapiMsg_IsInterfaceSupported msg(name, &unused_result);
+  PpapiMsg_SupportsInterface msg(name, &unused_result);
   GetDispatcher()->OnMessageReceived(msg);
 
   const IPC::Message* reply_msg =
       sink().GetUniqueMessageMatching(IPC_REPLY_ID);
   EXPECT_TRUE(reply_msg);
   if (!reply_msg)
     return false;
 
-  TupleTypes<PpapiMsg_IsInterfaceSupported::ReplyParam>::ValueTuple reply_data;
-  EXPECT_TRUE(PpapiMsg_IsInterfaceSupported::ReadReplyParam(
+  TupleTypes<PpapiMsg_SupportsInterface::ReplyParam>::ValueTuple reply_data;
+  EXPECT_TRUE(PpapiMsg_SupportsInterface::ReadReplyParam(
       reply_msg, &reply_data));
 
   sink().ClearMessages();
   return reply_data.a;
 }
 
 // PluginProxyTestHarness ------------------------------------------------------
 
 PluginProxyTestHarness::PluginProxyTestHarness(
     GlobalsConfiguration globals_config)
@@ skipping 430 matching lines @@
   plugin_thread_.message_loop_proxy()->PostTask(FROM_HERE,
       base::Bind(&RunTaskOnRemoteHarness,
                  task,
                  &task_complete));
   task_complete.Wait();
 }
 
 
 }  // namespace proxy
 }  // namespace ppapi