Modify U2F apdu classes to use unique pointers

device/u2f/u2f_hid_device.cc

 // Copyright 2017 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 "u2f_hid_device.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "crypto/random.h"
@@ skipping 15 matching lines @@
       weak_factory_(this) {
   channel_id_ = kBroadcastChannel;
 }
 
 U2fHidDevice::~U2fHidDevice() {
   // Cleanup connection
   if (connection_)
     connection_->Close();
 }
 
-void U2fHidDevice::DeviceTransact(scoped_refptr<U2fApduCommand> command,
+void U2fHidDevice::DeviceTransact(std::unique_ptr<U2fApduCommand> command,
                                   const DeviceCallback& callback) {
-  Transition(command, callback);
+  Transition(std::move(command), callback);
 }
 
-void U2fHidDevice::Transition(scoped_refptr<U2fApduCommand> command,
+void U2fHidDevice::Transition(std::unique_ptr<U2fApduCommand> command,
                               const DeviceCallback& callback) {
   switch (state_) {
     case State::INIT:
       state_ = State::BUSY;
       Connect(base::Bind(&U2fHidDevice::OnConnect, weak_factory_.GetWeakPtr(),
-                         command, callback));
+                         base::Passed(std::move(command)), callback));

[Reilly Grant (use Gerrit), 2017/03/21 23:02:29]

base::Passed(std::move(foo)) is fine but you can use base::Passed(&foo) if you
want to be a bit more concise.

[Casey Piper, 2017/03/21 23:26:33]

Done, updated everywhere.

       break;
     case State::CONNECTED:
       state_ = State::BUSY;
-      AllocateChannel(command, callback);
+      AllocateChannel(std::move(command), callback);
       break;
     case State::IDLE: {
       state_ = State::BUSY;
       scoped_refptr<U2fMessage> msg = U2fMessage::Create(
           channel_id_, U2fMessage::Type::CMD_MSG, command->GetEncodedCommand());
       WriteMessage(msg, true,
                    base::Bind(&U2fHidDevice::MessageReceived,
                               weak_factory_.GetWeakPtr(), callback));
       break;
     }
@@ skipping 14 matching lines @@
       break;
   }
 }
 
 void U2fHidDevice::Connect(const HidService::ConnectCallback& callback) {
   HidService* hid_service = DeviceClient::Get()->GetHidService();
 
   hid_service->Connect(device_info_->device_id(), callback);
 }
 
-void U2fHidDevice::OnConnect(scoped_refptr<U2fApduCommand> command,
+void U2fHidDevice::OnConnect(std::unique_ptr<U2fApduCommand> command,
                              const DeviceCallback& callback,
                              scoped_refptr<HidConnection> connection) {
   if (connection) {
     connection_ = connection;
     state_ = State::CONNECTED;
   } else {
     state_ = State::DEVICE_ERROR;
   }
-  Transition(command, callback);
+  Transition(std::move(command), callback);
 }
 
-void U2fHidDevice::AllocateChannel(scoped_refptr<U2fApduCommand> command,
+void U2fHidDevice::AllocateChannel(std::unique_ptr<U2fApduCommand> command,
                                    const DeviceCallback& callback) {
   // Send random nonce to device to verify received message
   std::vector<uint8_t> nonce(8);
   crypto::RandBytes(nonce.data(), nonce.size());
   scoped_refptr<U2fMessage> message =
       U2fMessage::Create(channel_id_, U2fMessage::Type::CMD_INIT, nonce);
 
   WriteMessage(
       message, true,
       base::Bind(&U2fHidDevice::OnAllocateChannel, weak_factory_.GetWeakPtr(),
-                 nonce, command, callback));
+                 nonce, base::Passed(std::move(command)), callback));
 }
 
 void U2fHidDevice::OnAllocateChannel(std::vector<uint8_t> nonce,
-                                     scoped_refptr<U2fApduCommand> command,
+                                     std::unique_ptr<U2fApduCommand> command,
                                      const DeviceCallback& callback,
                                      bool success,
                                      scoped_refptr<U2fMessage> message) {
   if (!success || !message) {
     state_ = State::DEVICE_ERROR;
     Transition(nullptr, callback);
     return;
   }
   // Channel allocation response is defined as:
   // 0: 8 byte nonce
@@ skipping 19 matching lines @@
   }
 
   size_t index = 8;
   channel_id_ = payload[index++] << 24;
   channel_id_ |= payload[index++] << 16;
   channel_id_ |= payload[index++] << 8;
   channel_id_ |= payload[index++];
   capabilities_ = payload[16];
 
   state_ = State::IDLE;
-  Transition(command, callback);
+  Transition(std::move(command), callback);
 }
 
 void U2fHidDevice::WriteMessage(scoped_refptr<U2fMessage> message,
                                 bool response_expected,
                                 U2fHidMessageCallback callback) {
   if (!connection_ || !message || message->NumPackets() == 0) {
     std::move(callback).Run(false, nullptr);
     return;
   }
 
@@ skipping 90 matching lines @@
 }
 
 void U2fHidDevice::MessageReceived(const DeviceCallback& callback,
                                    bool success,
                                    scoped_refptr<U2fMessage> message) {
   if (!success) {
     state_ = State::DEVICE_ERROR;
     Transition(nullptr, callback);
     return;
   }
-  scoped_refptr<U2fApduResponse> response = nullptr;
+  std::unique_ptr<U2fApduResponse> response = nullptr;
   if (message)
     response = U2fApduResponse::CreateFromMessage(message->GetMessagePayload());
   state_ = State::IDLE;
   base::WeakPtr<U2fHidDevice> self = weak_factory_.GetWeakPtr();
-  callback.Run(success, response);
+  callback.Run(success, std::move(response));
 
   // Executing |callback| may have freed |this|. Check |self| first.
   if (self && !pending_transactions_.empty()) {
     // If any transactions were queued, process the first one
-    scoped_refptr<U2fApduCommand> pending_cmd =
+    std::unique_ptr<U2fApduCommand> pending_cmd =
         std::move(pending_transactions_.front().first);
     DeviceCallback pending_cb = pending_transactions_.front().second;
     pending_transactions_.pop_front();
-    Transition(pending_cmd, pending_cb);
+    Transition(std::move(pending_cmd), pending_cb);
   }
 }
 
 void U2fHidDevice::TryWink(const WinkCallback& callback) {
   // Only try to wink if device claims support
   if (!(capabilities_ & kWinkCapability) || state_ != State::IDLE) {
     callback.Run();
     return;
   }
 
@@ skipping 16 matching lines @@
   return id.str();
 }
 
 // static
 bool U2fHidDevice::IsTestEnabled() {
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
   return command_line->HasSwitch(switches::kEnableU2fHidTest);
 }
 
 }  // namespace device