Index: ppapi/proxy/device_enumeration_resource_helper.cc |
diff --git a/ppapi/proxy/device_enumeration_resource_helper.cc b/ppapi/proxy/device_enumeration_resource_helper.cc |
index e8d63e1dbdfdbe78f8d1acfa4e635ec6d0e32d88..7495ec3af568fa36f680937f1003188e608c0007 100644 |
--- a/ppapi/proxy/device_enumeration_resource_helper.cc |
+++ b/ppapi/proxy/device_enumeration_resource_helper.cc |
@@ -36,24 +36,6 @@ DeviceEnumerationResourceHelper::DeviceEnumerationResourceHelper( |
DeviceEnumerationResourceHelper::~DeviceEnumerationResourceHelper() { |
} |
-int32_t DeviceEnumerationResourceHelper::EnumerateDevices0_2( |
- PP_Resource* devices, |
- scoped_refptr<TrackedCallback> callback) { |
- if (pending_enumerate_devices_) |
- return PP_ERROR_INPROGRESS; |
- if (!devices) |
- return PP_ERROR_BADARGUMENT; |
- |
- pending_enumerate_devices_ = true; |
- PpapiHostMsg_DeviceEnumeration_EnumerateDevices msg; |
- owner_->Call<PpapiPluginMsg_DeviceEnumeration_EnumerateDevicesReply>( |
- PluginResource::RENDERER, msg, |
- base::Bind( |
- &DeviceEnumerationResourceHelper::OnPluginMsgEnumerateDevicesReply0_2, |
- AsWeakPtr(), devices, callback)); |
- return PP_OK_COMPLETIONPENDING; |
-} |
- |
int32_t DeviceEnumerationResourceHelper::EnumerateDevices( |
const PP_ArrayOutput& output, |
scoped_refptr<TrackedCallback> callback) { |
@@ -132,27 +114,6 @@ void DeviceEnumerationResourceHelper::LastPluginRefWasDeleted() { |
// that properly. |
} |
-void DeviceEnumerationResourceHelper::OnPluginMsgEnumerateDevicesReply0_2( |
- PP_Resource* devices_resource, |
- scoped_refptr<TrackedCallback> callback, |
- const ResourceMessageReplyParams& params, |
- const std::vector<DeviceRefData>& devices) { |
- pending_enumerate_devices_ = false; |
- |
- // We shouldn't access |devices_resource| if the callback has been called, |
- // which is possible if the last plugin reference to the corresponding |
- // resource has gone away, and the callback has been aborted. |
- if (!TrackedCallback::IsPending(callback)) |
- return; |
- |
- if (params.result() == PP_OK) { |
- *devices_resource = PPB_DeviceRef_Shared::CreateResourceArray( |
- OBJECT_IS_PROXY, owner_->pp_instance(), devices); |
- } |
- |
- callback->Run(params.result()); |
-} |
- |
void DeviceEnumerationResourceHelper::OnPluginMsgEnumerateDevicesReply( |
const PP_ArrayOutput& output, |
scoped_refptr<TrackedCallback> callback, |