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

ppapi/cpp/dev/video_capture_dev.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/dev/video_capture_dev.h"
 
 #include "ppapi/c/dev/ppb_video_capture_dev.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/cpp/completion_callback.h"
 #include "ppapi/cpp/dev/device_ref_dev.h"
 #include "ppapi/cpp/dev/resource_array_dev.h"
-#include "ppapi/cpp/instance.h"
+#include "ppapi/cpp/instance_handle.h"
 #include "ppapi/cpp/module.h"
 #include "ppapi/cpp/module_impl.h"
 
 namespace pp {
 
 namespace {
 
 template <> const char* interface_name<PPB_VideoCapture_Dev>() {
   return PPB_VIDEOCAPTURE_DEV_INTERFACE;
 }
 
 }  // namespace
 
 struct VideoCapture_Dev::EnumerateDevicesState {
   EnumerateDevicesState(std::vector<DeviceRef_Dev>* in_devices,
                         const CompletionCallback& in_callback,
                         VideoCapture_Dev* in_video_capture)
       : devices_resource(0),
         devices(in_devices),
         callback(in_callback),
         video_capture(in_video_capture) {
   }
 
   PP_Resource devices_resource;
   std::vector<DeviceRef_Dev>* devices;
   CompletionCallback callback;
   VideoCapture_Dev* video_capture;
 };
 
-VideoCapture_Dev::VideoCapture_Dev(const Instance& instance)
+VideoCapture_Dev::VideoCapture_Dev(const InstanceHandle& instance)
     : enum_state_(NULL) {
   if (!has_interface<PPB_VideoCapture_Dev>())
     return;
   PassRefFromConstructor(get_interface<PPB_VideoCapture_Dev>()->Create(
       instance.pp_instance()));
 }
 
 VideoCapture_Dev::VideoCapture_Dev(PP_Resource resource)
     : Resource(resource),
       enum_state_(NULL) {
@@ skipping 89 matching lines @@
 // static
 void VideoCapture_Dev::OnEnumerateDevicesComplete(void* user_data,
                                                   int32_t result) {
   EnumerateDevicesState* enum_state =
       static_cast<EnumerateDevicesState*>(user_data);
 
   bool need_to_callback = !!enum_state->video_capture;
 
   if (result == PP_OK) {
     // It will take care of releasing the reference.
-    ResourceArray_Dev resources(ResourceArray_Dev::PassRef(),
-                                enum_state->devices_resource);
+    ResourceArray_Dev resources(pp::PASS_REF, enum_state->devices_resource);
 
     if (need_to_callback) {
       enum_state->devices->clear();
       for (uint32_t index = 0; index < resources.size(); ++index) {
         DeviceRef_Dev device(resources[index]);
         enum_state->devices->push_back(device);
       }
     }
   }
 
   if (need_to_callback) {
     enum_state->video_capture->enum_state_ = NULL;
     enum_state->callback.Run(result);
   }
 
   delete enum_state;
 }
 
 }  // namespace pp