Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(13)

Unified Diff: extensions/browser/api/usb/usb_api.cc

Issue 2038613003: Revert of ExtensionFunction: don't pass ownership of base::Value by raw pointer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: extensions/browser/api/usb/usb_api.cc
diff --git a/extensions/browser/api/usb/usb_api.cc b/extensions/browser/api/usb/usb_api.cc
index b8c2aac37ed3abdf371d9326727bed1b1438329a..6bfeeaa5e8c0212b91df3e6d41c438266fd86023 100644
--- a/extensions/browser/api/usb/usb_api.cc
+++ b/extensions/browser/api/usb/usb_api.cc
@@ -12,7 +12,6 @@
#include <vector>
#include "base/barrier_closure.h"
-#include "base/memory/ptr_util.h"
#include "device/core/device_client.h"
#include "device/usb/usb_descriptors.h"
#include "device/usb/usb_device_handle.h"
@@ -249,14 +248,14 @@
}
}
-std::unique_ptr<base::Value> PopulateConnectionHandle(int handle,
- int vendor_id,
- int product_id) {
+base::Value* PopulateConnectionHandle(int handle,
+ int vendor_id,
+ int product_id) {
ConnectionHandle result;
result.handle = handle;
result.vendor_id = vendor_id;
result.product_id = product_id;
- return result.ToValue();
+ return result.ToValue().release();
}
TransferType ConvertTransferTypeToApi(const UsbTransferType& input) {
@@ -613,7 +612,7 @@
EXTENSION_FUNCTION_VALIDATE(parameters.get());
if (!user_gesture()) {
- return RespondNow(OneArgument(base::MakeUnique<base::ListValue>()));
+ return RespondNow(OneArgument(new base::ListValue()));
}
bool multiple = false;
@@ -708,8 +707,7 @@
std::unique_ptr<extensions::api::usb::RequestAccess::Params> parameters =
RequestAccess::Params::Create(*args_);
EXTENSION_FUNCTION_VALIDATE(parameters.get());
- return RespondNow(
- OneArgument(base::MakeUnique<base::FundamentalValue>(true)));
+ return RespondNow(OneArgument(new base::FundamentalValue(true)));
}
UsbOpenDeviceFunction::UsbOpenDeviceFunction() {
@@ -1253,7 +1251,7 @@
void UsbResetDeviceFunction::OnComplete(bool success) {
if (success) {
- Respond(OneArgument(base::MakeUnique<base::FundamentalValue>(true)));
+ Respond(OneArgument(new base::FundamentalValue(true)));
} else {
scoped_refptr<UsbDeviceHandle> device_handle =
GetDeviceHandle(parameters_->handle);
« no previous file with comments | « extensions/browser/api/storage/storage_api.cc ('k') | extensions/browser/api/vpn_provider/vpn_provider_api.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698