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

Review URL: https://chromiumcodereview.appspot.com/9381010

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@123795 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 13 insertions, 13 deletions

diff --git a/ppapi/cpp/dev/url_util_dev.cc b/ppapi/cpp/dev/url_util_dev.cc
index 3d07cb4..0353883 100644
--- a/ppapi/cpp/dev/url_util_dev.cc
+++ b/ppapi/cpp/dev/url_util_dev.cc
@@ -4,7 +4,7 @@
 
 #include "ppapi/cpp/dev/url_util_dev.h"
 
-#include "ppapi/cpp/instance.h"
+#include "ppapi/cpp/instance_handle.h"
 #include "ppapi/cpp/module.h"
 
 namespace pp {
@@ -27,24 +27,23 @@ const URLUtil_Dev* URLUtil_Dev::Get() {
 
 Var URLUtil_Dev::Canonicalize(const Var& url,
                               PP_URLComponents_Dev* components) const {
-  return Var(Var::PassRef(),
-             interface_->Canonicalize(url.pp_var(), components));
+  return Var(PASS_REF, interface_->Canonicalize(url.pp_var(), components));
 }
 
 Var URLUtil_Dev::ResolveRelativeToURL(const Var& base_url,
                                       const Var& relative_string,
                                       PP_URLComponents_Dev* components) const {
-  return Var(Var::PassRef(),
+  return Var(PASS_REF,
              interface_->ResolveRelativeToURL(base_url.pp_var(),
                                               relative_string.pp_var(),
                                               components));
 }
 
 Var URLUtil_Dev::ResolveRelativeToDocument(
-    const Instance& instance,
+    const InstanceHandle& instance,
     const Var& relative_string,
     PP_URLComponents_Dev* components) const {
-  return Var(Var::PassRef(),
+  return Var(PASS_REF,
              interface_->ResolveRelativeToDocument(instance.pp_instance(),
                                                    relative_string.pp_var(),
                                                    components));
@@ -56,28 +55,29 @@ bool URLUtil_Dev::IsSameSecurityOrigin(const Var& url_a,
                                                     url_b.pp_var()));
 }
 
-bool URLUtil_Dev::DocumentCanRequest(const Instance& instance,
+bool URLUtil_Dev::DocumentCanRequest(const InstanceHandle& instance,
                                      const Var& url) const {
   return PP_ToBool(interface_->DocumentCanRequest(instance.pp_instance(),
                                                   url.pp_var()));
 }
 
-bool URLUtil_Dev::DocumentCanAccessDocument(const Instance& active,
-                                            const Instance& target) const {
+bool URLUtil_Dev::DocumentCanAccessDocument(
+    const InstanceHandle& active,
+    const InstanceHandle& target) const {
   return PP_ToBool(
       interface_->DocumentCanAccessDocument(active.pp_instance(),
                                             target.pp_instance()));
 }
 
-Var URLUtil_Dev::GetDocumentURL(const Instance& instance,
+Var URLUtil_Dev::GetDocumentURL(const InstanceHandle& instance,
                                 PP_URLComponents_Dev* components) const {
-  return Var(Var::PassRef(),
+  return Var(PASS_REF,
              interface_->GetDocumentURL(instance.pp_instance(), components));
 }
 
-Var URLUtil_Dev::GetPluginInstanceURL(const Instance& instance,
+Var URLUtil_Dev::GetPluginInstanceURL(const InstanceHandle& instance,
                                       PP_URLComponents_Dev* components) const {
-  return Var(Var::PassRef(),
+  return Var(PASS_REF,
              interface_->GetPluginInstanceURL(instance.pp_instance(),
                                               components));
 }