Convert resources to take an instance key instead of an Instance*.

ppapi/tests/test_char_set.cc

 // Copyright (c) 2012 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 "ppapi/tests/test_char_set.h"
 
 #include "ppapi/c/dev/ppb_char_set_dev.h"
 #include "ppapi/c/trusted/ppb_char_set_trusted.h"
 #include "ppapi/cpp/dev/memory_dev.h"
 #include "ppapi/cpp/module.h"
@@ skipping 334 matching lines @@
       badutf8, 3, "poopiepants", PP_CHARSET_TRUSTED_CONVERSIONERROR_SUBSTITUTE,
       &output_buffer[0], &utf16result_len);
   ASSERT_TRUE(!result);
   ASSERT_TRUE(utf16result_len == 0);
 
   PASS();
 }
 
 std::string TestCharSet::TestGetDefaultCharSet() {
   // Test invalid instance.
-  pp::Var result(pp::Var::PassRef(), char_set_interface_->GetDefaultCharSet(0));
+  pp::Var result(pp::PASS_REF, char_set_interface_->GetDefaultCharSet(0));
   ASSERT_TRUE(result.is_undefined());
 
   // Just make sure the default char set is a nonempty string.
-  result = pp::Var(pp::Var::PassRef(),
+  result = pp::Var(pp::PASS_REF,
       char_set_interface_->GetDefaultCharSet(instance_->pp_instance()));
   ASSERT_TRUE(result.is_string());
   ASSERT_FALSE(result.AsString().empty());
 
   PASS();
 }
 
 std::vector<uint16_t> TestCharSet::UTF8ToUTF16(const std::string& utf8) {
   uint32_t result_len = 0;
   uint16_t* result = char_set_interface_->CharSetToUTF16(
       instance_->pp_instance(), utf8.c_str(),
       static_cast<uint32_t>(utf8.size()),
       "utf-8", PP_CHARSET_CONVERSIONERROR_FAIL, &result_len);
 
   std::vector<uint16_t> result_vector;
   if (!result)
     return result_vector;
 
   result_vector.assign(result, &result[result_len]);
   pp::Memory_Dev memory;
   memory.MemFree(result);
   return result_vector;
 }