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

ppapi/cpp/websocket.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/cpp/websocket.h"
 
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/pp_macros.h"
 #include "ppapi/cpp/completion_callback.h"
-#include "ppapi/cpp/instance.h"
+#include "ppapi/cpp/instance_handle.h"
 #include "ppapi/cpp/module.h"
 #include "ppapi/cpp/module_impl.h"
 #include "ppapi/cpp/var.h"
 
 namespace pp {
 
 namespace {
 
 template <> const char* interface_name<PPB_WebSocket>() {
   return PPB_WEBSOCKET_INTERFACE;
 }
 
 }  // namespace
 
-WebSocket::WebSocket(Instance* instance) {
+WebSocket::WebSocket(const InstanceHandle& instance) {
   if (!has_interface<PPB_WebSocket>())
     return;
   PassRefFromConstructor(get_interface<PPB_WebSocket>()->Create(
-    instance->pp_instance()));
+    instance.pp_instance()));
 }
 
 WebSocket::~WebSocket() {
 }
 
 int32_t WebSocket::Connect(const Var& url, const Var protocols[],
     uint32_t protocol_count, const CompletionCallback& callback) {
   if (!has_interface<PPB_WebSocket>())
     return PP_ERROR_BADRESOURCE;
 
@@ skipping 54 matching lines @@
   if (!has_interface<PPB_WebSocket>())
     return 0;
 
   return get_interface<PPB_WebSocket>()->GetCloseCode(pp_resource());
 }
 
 Var WebSocket::GetCloseReason() {
   if (!has_interface<PPB_WebSocket>())
     return 0;
 
-  return Var(Var::PassRef(),
+  return Var(PASS_REF,
       get_interface<PPB_WebSocket>()->GetCloseReason(pp_resource()));
 }
 
 bool WebSocket::GetCloseWasClean() {
   if (!has_interface<PPB_WebSocket>())
     return false;
 
   PP_Bool result =
       get_interface<PPB_WebSocket>()->GetCloseWasClean(pp_resource());
   return PP_ToBool(result);
 }
 
 Var WebSocket::GetExtensions() {
   if (!has_interface<PPB_WebSocket>())
     return Var();
 
-  return Var(Var::PassRef(),
-      get_interface<PPB_WebSocket>()->GetExtensions(pp_resource()));
+  return Var(PASS_REF,
+             get_interface<PPB_WebSocket>()->GetExtensions(pp_resource()));
 }
 
 Var WebSocket::GetProtocol() {
   if (!has_interface<PPB_WebSocket>())
     return Var();
 
-  return Var(Var::PassRef(),
-      get_interface<PPB_WebSocket>()->GetProtocol(pp_resource()));
+  return Var(PASS_REF,
+             get_interface<PPB_WebSocket>()->GetProtocol(pp_resource()));
 }
 
 PP_WebSocketReadyState WebSocket::GetReadyState() {
   if (!has_interface<PPB_WebSocket>())
     return PP_WEBSOCKETREADYSTATE_INVALID;
 
   return get_interface<PPB_WebSocket>()->GetReadyState(pp_resource());
 }
 
 Var WebSocket::GetURL() {
   if (!has_interface<PPB_WebSocket>())
     return Var();
 
-  return Var(Var::PassRef(),
-      get_interface<PPB_WebSocket>()->GetURL(pp_resource()));
+  return Var(PASS_REF,
+             get_interface<PPB_WebSocket>()->GetURL(pp_resource()));
 }
 
 }  // namespace pp