Make o.o.p. proxy handle PPP_Instance versions 0.4 and 0.5.

ppapi/proxy/plugin_resource_tracker.h

 // 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.
 
 #ifndef PPAPI_PROXY_PLUGIN_RESOURCE_TRACKER_H_
 #define PPAPI_PROXY_PLUGIN_RESOURCE_TRACKER_H_
 
 #include <map>
 #include <utility>
 
@@ skipping 48 matching lines @@
   virtual ::ppapi::ResourceObjectBase* GetResourceAPI(
       PP_Resource res) OVERRIDE;
   virtual ::ppapi::FunctionGroupBase* GetFunctionAPI(
       PP_Instance inst,
       pp::proxy::InterfaceID id) OVERRIDE;
   virtual PP_Instance GetInstanceForResource(PP_Resource resource) OVERRIDE;
 
  private:
   friend struct DefaultSingletonTraits<PluginResourceTracker>;
   friend class PluginResourceTrackerTest;
-  friend class PluginProxyTest;
+  friend class PluginProxyTestHarness;
 
   PluginResourceTracker();
   virtual ~PluginResourceTracker();
 
   struct ResourceInfo {
     ResourceInfo();
     ResourceInfo(int ref_count, linked_ptr<PluginResource> r);
     ResourceInfo(const ResourceInfo& other);
     ~ResourceInfo();
 
@@ skipping 18 matching lines @@
   // duplicates.
   PP_Resource last_resource_id_;
 
   DISALLOW_COPY_AND_ASSIGN(PluginResourceTracker);
 };
 
 }  // namespace proxy
 }  // namespace pp
 
 #endif  // PPAPI_PROXY_PLUGIN_RESOURCE_TRACKER_H_