Index: ppapi/cpp/websocket.cc |
diff --git a/ppapi/cpp/websocket.cc b/ppapi/cpp/websocket.cc |
index 2a653707068ad20ecf4b8413d8015d6248062b1f..11c2aacfdc3a3c92dedd67a6b832961dfd229167 100644 |
--- a/ppapi/cpp/websocket.cc |
+++ b/ppapi/cpp/websocket.cc |
@@ -7,7 +7,7 @@ |
#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" |
@@ -22,11 +22,11 @@ template <> const char* interface_name<PPB_WebSocket>() { |
} // 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() { |
@@ -101,7 +101,7 @@ 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())); |
} |
@@ -118,16 +118,16 @@ 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() { |
@@ -141,8 +141,8 @@ 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 |