Corresponding change in Pepper since EnumerateDevices contract is changed.

ppapi/shared_impl/ppb_video_capture_shared.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/shared_impl/ppb_video_capture_shared.h"
 
 #include "base/logging.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/shared_impl/ppb_device_ref_shared.h"
 #include "ppapi/shared_impl/ppb_resource_array_shared.h"
@@ skipping 26 matching lines @@
 
 int32_t PPB_VideoCapture_Shared::EnumerateDevices(
     PP_Resource* devices,
     scoped_refptr<TrackedCallback> callback) {
   if (TrackedCallback::IsPending(enumerate_devices_callback_))
     return PP_ERROR_INPROGRESS;
 
   return InternalEnumerateDevices(devices, callback);
 }
 
+int32_t PPB_VideoCapture_Shared::StopEnumerateDevices(
+    PP_Resource* devices) {
+  devices_ = NULL;
+  enumerate_devices_callback_ = NULL;
+  return InternalStopEnumerateDevices(devices);
+}
+
 int32_t PPB_VideoCapture_Shared::Open(
     const std::string& device_id,
     const PP_VideoCaptureDeviceInfo_Dev& requested_info,
     uint32_t buffer_count,
     scoped_refptr<TrackedCallback> callback) {
   if (open_state_ != BEFORE_OPEN)
     return PP_ERROR_FAILED;
 
   if (TrackedCallback::IsPending(open_callback_))
     return PP_ERROR_INPROGRESS;
@@ skipping 58 matching lines @@
 
 void PPB_VideoCapture_Shared::OnEnumerateDevicesComplete(
     int32_t result,
     const std::vector<DeviceRefData>& devices) {
   DCHECK(TrackedCallback::IsPending(enumerate_devices_callback_));
 
   if (result == PP_OK && devices_) {
     *devices_ = PPB_DeviceRef_Shared::CreateResourceArray(
         resource_object_type_, pp_instance(), devices);
   }
-  devices_ = NULL;
-
-  TrackedCallback::ClearAndRun(&enumerate_devices_callback_, result);
+  enumerate_devices_callback_->Run(result);
 }
 
 void PPB_VideoCapture_Shared::OnOpenComplete(int32_t result) {
   if (open_state_ == BEFORE_OPEN && result == PP_OK)
     open_state_ = OPENED;
 
   // The callback may have been aborted by Close(), or the open operation is
   // completed synchronously.
   if (TrackedCallback::IsPending(open_callback_))
     TrackedCallback::ClearAndRun(&open_callback_, result);
@@ skipping 40 matching lines @@
         }
         break;
     }
   }
 
   status_ = status;
   return true;
 }
 
 }  // namespace ppapi