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

ppapi/proxy/plugin_var_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_VAR_TRACKER_H_
 #define PPAPI_PROXY_PLUGIN_VAR_TRACKER_H_
 
 #include <map>
 #include <string>
 
@@ skipping 70 matching lines @@
                          const PP_Var& host_object);
 
   // Retrieves the internal reference counts for testing. Returns 0 if we
   // know about the object but the corresponding value is 0, or -1 if the
   // given object ID isn't in our map.
   int GetRefCountForObject(const PP_Var& plugin_object);
   int GetTrackedWithNoReferenceCountForObject(const PP_Var& plugin_object);
 
  private:
   friend struct DefaultSingletonTraits<PluginVarTracker>;
-  friend class PluginProxyTest;
+  friend class PluginProxyTestHarness;
 
   class RefCountedString : public base::RefCounted<RefCountedString> {
    public:
     RefCountedString() {
     }
     RefCountedString(const std::string& str) : value_(str) {
     }
     RefCountedString(const char* data, size_t len)
         : value_(data, len) {
     }
@@ skipping 85 matching lines @@
   VarID last_plugin_var_id_;
 
   // Get a new Var ID and increment last_plugin_var_id_.
   VarID GetNewVarID();
 };
 
 }  // namespace proxy
 }  // namespace pp
 
 #endif  // PPAPI_PROXY_PLUGIN_VAR_TRACKER_H_