Remove all uses of the global Dispatcher Get function.

ppapi/proxy/plugin_dispatcher.h

 // 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.
 
 #ifndef PPAPI_PROXY_PLUGIN_DISPATCHER_H_
 #define PPAPI_PROXY_PLUGIN_DISPATCHER_H_
 
 #include <string>
 
 #include "base/hash_tables.h"
@@ skipping 23 matching lines @@
   // will be automatically called when requested by the renderer side. The
   // module ID will be set upon receipt of the InitializeModule message.
   //
   // You must call Dispatcher::InitWithChannel after the constructor.
   PluginDispatcher(base::ProcessHandle remote_process_handle,
                    GetInterfaceFunc get_interface,
                    InitModuleFunc init_module,
                    ShutdownModuleFunc shutdown_module);
   ~PluginDispatcher();
 
-  // Sets/gets the global dispatcher pointer. New code should use the
-  // GetForInstance version below, this is currently here as a stopgap while
-  // the transition is being made.
-  //
-  // TODO(brettw) remove this.
-  static PluginDispatcher* Get();
-  static void SetGlobal(PluginDispatcher* dispatcher);
-
   // The plugin side maintains a mapping from PP_Instance to Dispatcher so
   // that we can send the messages to the right channel if there are multiple
-  // renderers sharing the same plugin.
+  // renderers sharing the same plugin. This mapping is maintained by
+  // DidCreateInstance/DidDestroyInstance.
   static PluginDispatcher* GetForInstance(PP_Instance instance);
-  /* TODO(brettw) enable this when Get() is removed.
-  static void SetForInstance(PP_Instance instance,
-                             PluginDispatcher* dispatcher);
-  static void RemoveForInstance(PP_Instance instance);
-  */
 
   // Dispatcher overrides.
   virtual bool IsPlugin() const;
 
   // IPC::Channel::Listener implementation.
   virtual bool OnMessageReceived(const IPC::Message& msg);
 
-  // Keep track of all active instances to associate data with it, like the
-  // current size.
+  // Keeps track of which dispatcher to use for each instance, active instances
+  // and tracks associated data like the current size.
   void DidCreateInstance(PP_Instance instance);
   void DidDestroyInstance(PP_Instance instance);
 
   // Gets the data for an existing instance, or NULL if the instance id doesn't
   // correspond to  a known instance.
   InstanceData* GetInstanceData(PP_Instance instance);
 
  private:
+  friend class PluginDispatcherTest;
+
   // IPC message handlers.
   void OnMsgInitializeModule(PP_Module pp_module, bool* result);
   void OnMsgShutdown();
+  void OnMsgSupportsInterface(const std::string& interface_name, bool* result);
 
   InitModuleFunc init_module_;
   ShutdownModuleFunc shutdown_module_;
 
+  // All target proxies currently created. These are ones that receive
+  // messages.
+  scoped_ptr<InterfaceProxy> target_proxies_[INTERFACE_ID_COUNT];
+
   typedef base::hash_map<PP_Instance, InstanceData> InstanceDataMap;
   InstanceDataMap instance_map_;
 
   DISALLOW_COPY_AND_ASSIGN(PluginDispatcher);
 };
 
 }  // namespace proxy
 }  // namespace pp
 
 #endif  // PPAPI_PROXY_PLUGIN_DISPATCHER_H_