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

Unified Diff: chrome/browser/devtools/device/usb/android_usb_device.cc

Issue 2334613003: Re-write many calls to WrapUnique() with MakeUnique() (Closed)
Patch Set: Changes from review by sky Created 4 years, 3 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: chrome/browser/devtools/device/usb/android_usb_device.cc
diff --git a/chrome/browser/devtools/device/usb/android_usb_device.cc b/chrome/browser/devtools/device/usb/android_usb_device.cc
index 87cc450d0766c3b941277d515101e4a081476f86..046391ab3d1d41cc722606298790e2e0155c3f44 100644
--- a/chrome/browser/devtools/device/usb/android_usb_device.cc
+++ b/chrome/browser/devtools/device/usb/android_usb_device.cc
@@ -360,8 +360,8 @@ void AndroidUsbDevice::InitOnCallerThread() {
if (task_runner_)
return;
task_runner_ = base::ThreadTaskRunnerHandle::Get();
- Queue(base::WrapUnique(new AdbMessage(AdbMessage::kCommandCNXN, kVersion,
- kMaxPayload, kHostConnectMessage)));
+ Queue(base::MakeUnique<AdbMessage>(AdbMessage::kCommandCNXN, kVersion,
+ kMaxPayload, kHostConnectMessage));
ReadHeader();
}
@@ -577,20 +577,20 @@ void AndroidUsbDevice::HandleIncoming(std::unique_ptr<AdbMessage> message) {
{
DCHECK_EQ(message->arg0, static_cast<uint32_t>(AdbMessage::kAuthToken));
if (signature_sent_) {
- Queue(base::WrapUnique(new AdbMessage(
+ Queue(base::MakeUnique<AdbMessage>(
AdbMessage::kCommandAUTH, AdbMessage::kAuthRSAPublicKey, 0,
- AndroidRSAPublicKey(rsa_key_.get()))));
+ AndroidRSAPublicKey(rsa_key_.get())));
} else {
signature_sent_ = true;
std::string signature = AndroidRSASign(rsa_key_.get(), message->body);
if (!signature.empty()) {
- Queue(base::WrapUnique(new AdbMessage(AdbMessage::kCommandAUTH,
- AdbMessage::kAuthSignature, 0,
- signature)));
+ Queue(base::MakeUnique<AdbMessage>(AdbMessage::kCommandAUTH,
+ AdbMessage::kAuthSignature, 0,
+ signature));
} else {
- Queue(base::WrapUnique(new AdbMessage(
+ Queue(base::MakeUnique<AdbMessage>(
AdbMessage::kCommandAUTH, AdbMessage::kAuthRSAPublicKey, 0,
- AndroidRSAPublicKey(rsa_key_.get()))));
+ AndroidRSAPublicKey(rsa_key_.get())));
}
}
}
« no previous file with comments | « chrome/browser/devtools/device/usb/android_usb_browsertest.cc ('k') | chrome/browser/devtools/remote_debugging_server.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698