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

ppapi/cpp/dev/zoom_dev.cc

Index: ppapi/cpp/dev/zoom_dev.cc
diff --git a/ppapi/cpp/dev/zoom_dev.cc b/ppapi/cpp/dev/zoom_dev.cc
index 49a8cecd255043be7725bbc2d0b922f5caec24d3..4e9f78ff70925f009ed6116ee4484c3afa14f05c 100644
--- a/ppapi/cpp/dev/zoom_dev.cc
+++ b/ppapi/cpp/dev/zoom_dev.cc
@@ -6,6 +6,7 @@
 
 #include "ppapi/c/dev/ppb_zoom_dev.h"
 #include "ppapi/cpp/instance.h"
+#include "ppapi/cpp/instance_handle.h"
 #include "ppapi/cpp/module.h"
 #include "ppapi/cpp/module_impl.h"
 
@@ -18,8 +19,7 @@ static const char kPPPZoomInterface[] = PPP_ZOOM_DEV_INTERFACE;
 void Zoom(PP_Instance instance,
           double factor,
           PP_Bool text_only) {
-  void* object =
-      pp::Instance::GetPerInstanceObject(instance, kPPPZoomInterface);
+  void* object = Instance::GetPerInstanceObject(instance, kPPPZoomInterface);
   if (!object)
     return;
   static_cast<Zoom_Dev*>(object)->Zoom(factor, PP_ToBool(text_only));
@@ -35,19 +35,21 @@ template <> const char* interface_name<PPB_Zoom_Dev>() {
 
 }  // namespace
 
-Zoom_Dev::Zoom_Dev(Instance* instance) : associated_instance_(instance) {
-  pp::Module::Get()->AddPluginInterface(kPPPZoomInterface, &ppp_zoom);
-  associated_instance_->AddPerInstanceObject(kPPPZoomInterface, this);
+Zoom_Dev::Zoom_Dev(const InstanceHandle& instance)
+    : associated_instance_(instance) {
+  Module::Get()->AddPluginInterface(kPPPZoomInterface, &ppp_zoom);
+  Instance::AddPerInstanceObject(instance, kPPPZoomInterface, this);
 }
 
 Zoom_Dev::~Zoom_Dev() {
-  associated_instance_->RemovePerInstanceObject(kPPPZoomInterface, this);
+  Instance::RemovePerInstanceObject(associated_instance_,
+                                    kPPPZoomInterface, this);
 }
 
 void Zoom_Dev::ZoomChanged(double factor) {
   if (has_interface<PPB_Zoom_Dev>())
     get_interface<PPB_Zoom_Dev>()->ZoomChanged(
-        associated_instance_->pp_instance(), factor);
+        associated_instance_.pp_instance(), factor);
 }
 
 void Zoom_Dev::ZoomLimitsChanged(double minimum_factor,
@@ -55,7 +57,7 @@ void Zoom_Dev::ZoomLimitsChanged(double minimum_factor,
   if (!has_interface<PPB_Zoom_Dev>())
     return;
   get_interface<PPB_Zoom_Dev>()->ZoomLimitsChanged(
-      associated_instance_->pp_instance(), minimum_factor, maximium_factor);
+      associated_instance_.pp_instance(), minimum_factor, maximium_factor);
 }
 
 }  // namespace pp