Ensure that PP_Instance values are unique within a plugin process in addition...

ppapi/proxy/host_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_HOST_DISPATCHER_H_
 #define PPAPI_PROXY_HOST_DISPATCHER_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 61 matching lines @@
 
   // Returns the proxy object associated with the given interface ID, creating
   // it if necessary. This is used in cases where a proxy needs to access code
   // in the proxy for another interface. It's assumed that the interface always
   // exists, so this is only used for browser proxies.
   //
   // Will return NULL if an interface isn't supported.
   InterfaceProxy* GetOrCreatePPBInterfaceProxy(InterfaceID id);
 
   // Returns the proxy interface for talking to the implementation.
-  const PPB_Proxy_Private* GetPPBProxy();
+  const PPB_Proxy_Private* ppb_proxy() const { return ppb_proxy_; }
 
  private:
   friend class HostDispatcherTest;
 
   // Makes an instance of the given PPB interface proxy, storing it in the
   // target_proxies_ array. An proxy for this interface must not exist yet.
   InterfaceProxy* CreatePPBInterfaceProxy(const InterfaceProxy::Info* info);
 
   PP_Module pp_module_;
 
   enum PluginInterfaceSupport {
     INTERFACE_UNQUERIED = 0,  // Must be 0 so memset(0) will clear the list.
     INTERFACE_SUPPORTED,
     INTERFACE_UNSUPPORTED
   };
   PluginInterfaceSupport plugin_interface_support_[INTERFACE_ID_COUNT];
 
   // All target proxies currently created. These are ones that receive
   // messages. They are created on demand when we receive messages.
   scoped_ptr<InterfaceProxy> target_proxies_[INTERFACE_ID_COUNT];
 
-  // Lazily initialized, may be NULL. Use GetPPBProxy().
+  // Guaranteed non-NULL.
   const PPB_Proxy_Private* ppb_proxy_;
 
   DISALLOW_COPY_AND_ASSIGN(HostDispatcher);
 };
 
 }  // namespace proxy
 }  // namespace pp
 
 #endif  // PPAPI_PROXY_HOST_DISPATCHER_H_