Revert 100748 - This patch tries to remove most of the manual registration for Pepper interfaces,...

ppapi/proxy/plugin_dispatcher_unittest.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 "base/memory/scoped_ptr.h"
 #include "ipc/ipc_message_utils.h"
 #include "ppapi/c/ppb_audio.h"
 #include "ppapi/c/ppp_instance.h"
 #include "ppapi/proxy/ppapi_messages.h"
 #include "ppapi/proxy/ppapi_proxy_test.h"
@@ skipping 35 matching lines @@
 
 PPP_Instance dummy_ppp_instance_interface = {};
 
 }  // namespace
 
 class PluginDispatcherTest : public PluginProxyTest {
  public:
   PluginDispatcherTest() {}
 
   bool HasTargetProxy(InterfaceID id) {
-    return !!plugin_dispatcher()->proxies_[id].get();
+    return !!plugin_dispatcher()->target_proxies_[id].get();
   }
 };
 
 TEST_F(PluginDispatcherTest, SupportsInterface) {
   RegisterTestInterface(PPB_AUDIO_INTERFACE, &dummy_audio_interface);
   RegisterTestInterface(PPP_INSTANCE_INTERFACE, &dummy_ppp_instance_interface);
 
   // Sending a request for a random interface should fail.
   EXPECT_FALSE(SupportsInterface("Random interface"));
 
+  // Sending a request for a PPB interface should fail even though we've
+  // registered it as existing in the GetInterface function (the plugin proxy
+  // should only respond to PPP interfaces when asked if it supports them).
+  EXPECT_FALSE(SupportsInterface(PPB_AUDIO_INTERFACE));
+
   // Sending a request for a supported PPP interface should succeed.
   EXPECT_TRUE(SupportsInterface(PPP_INSTANCE_INTERFACE));
 }
 
 TEST_F(PluginDispatcherTest, PPBCreation) {
   // Sending a PPB message out of the blue should create a target proxy for
   // that interface in the plugin.
   EXPECT_FALSE(HasTargetProxy(INTERFACE_ID_PPB_AUDIO));
   PpapiMsg_PPBAudio_NotifyAudioStreamCreated audio_msg(
       INTERFACE_ID_PPB_AUDIO, HostResource(), 0,
       IPC::PlatformFileForTransit(), base::SharedMemoryHandle(), 0);
   plugin_dispatcher()->OnMessageReceived(audio_msg);
   EXPECT_TRUE(HasTargetProxy(INTERFACE_ID_PPB_AUDIO));
 }
 
 }  // namespace proxy
 }  // namespace ppapi