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

ppapi/cpp/url_loader.cc

Index: ppapi/cpp/url_loader.cc
diff --git a/ppapi/cpp/url_loader.cc b/ppapi/cpp/url_loader.cc
index a2cef702d623c73cbb7dfd158545ec56202082a9..73855e94c126fd9952117b5b438865781564bc9c 100644
--- a/ppapi/cpp/url_loader.cc
+++ b/ppapi/cpp/url_loader.cc
@@ -8,7 +8,7 @@
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/cpp/completion_callback.h"
 #include "ppapi/cpp/file_ref.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/url_request_info.h"
@@ -27,21 +27,13 @@ template <> const char* interface_name<PPB_URLLoader>() {
 URLLoader::URLLoader(PP_Resource resource) : Resource(resource) {
 }
 
-// TODO(brettw) remove this when NaCl is updated.
-URLLoader::URLLoader(const Instance& instance) {
+URLLoader::URLLoader(const InstanceHandle& instance) {
   if (!has_interface<PPB_URLLoader>())
     return;
   PassRefFromConstructor(get_interface<PPB_URLLoader>()->Create(
       instance.pp_instance()));
 }
 
-URLLoader::URLLoader(Instance* instance) {
-  if (!has_interface<PPB_URLLoader>())
-    return;
-  PassRefFromConstructor(get_interface<PPB_URLLoader>()->Create(
-      instance->pp_instance()));
-}
-
 URLLoader::URLLoader(const URLLoader& other) : Resource(other) {
 }
 
@@ -81,7 +73,7 @@ bool URLLoader::GetDownloadProgress(
 URLResponseInfo URLLoader::GetResponseInfo() const {
   if (!has_interface<PPB_URLLoader>())
     return URLResponseInfo();
-  return URLResponseInfo(URLResponseInfo::PassRef(),
+  return URLResponseInfo(PASS_REF,
                          get_interface<PPB_URLLoader>()->GetResponseInfo(
                              pp_resource()));
 }