Use vectors instead of IOBuffer for U2fPackets

device/u2f/u2f_message.cc

 // Copyright 2016 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 "base/memory/ptr_util.h"
 #include "device/u2f/u2f_packet.h"
 #include "net/base/io_buffer.h"
 
 #include "u2f_message.h"
 
 namespace device {
 
 // static
 std::unique_ptr<U2fMessage> U2fMessage::Create(
     uint32_t channel_id,
     Type type,
     const std::vector<uint8_t>& data) {
   if (data.size() > kMaxMessageSize)
     return nullptr;
 
   return base::MakeUnique<U2fMessage>(channel_id, type, data);
 }
 
 // static
 std::unique_ptr<U2fMessage> U2fMessage::CreateFromSerializedData(
-    scoped_refptr<net::IOBufferWithSize> buf) {
+    const std::vector<uint8_t>& buf) {
   size_t remaining_size = 0;
-  if (buf == nullptr ||
-      static_cast<size_t>(buf->size()) > U2fPacket::kPacketSize ||
-      static_cast<size_t>(buf->size()) < kInitPacketHeader)
+  if (buf.size() > U2fPacket::kPacketSize || buf.size() < kInitPacketHeader)
     return nullptr;
 
   std::unique_ptr<U2fInitPacket> init_packet =
       U2fInitPacket::CreateFromSerializedData(buf, &remaining_size);
   if (init_packet == nullptr)
     return nullptr;
 
   return base::MakeUnique<U2fMessage>(std::move(init_packet), remaining_size);
 }
 
@@ skipping 47 matching lines @@
 std::list<std::unique_ptr<U2fPacket>>::const_iterator U2fMessage::begin() {
   return packets_.cbegin();
 }
 
 std::list<std::unique_ptr<U2fPacket>>::const_iterator U2fMessage::end() {
   return packets_.cend();
 }
 
 scoped_refptr<net::IOBufferWithSize> U2fMessage::PopNextPacket() {
   if (NumPackets() > 0) {
-    scoped_refptr<net::IOBufferWithSize> buf =
-        packets_.front()->GetSerializedBuffer();
+    scoped_refptr<net::IOBufferWithSize> data =
+        packets_.front()->GetSerializedData();
+
     packets_.pop_front();
-    return buf;
+    return data;
   }
   return nullptr;
 }
 
-bool U2fMessage::AddContinuationPacket(
-    scoped_refptr<net::IOBufferWithSize> buf) {
+bool U2fMessage::AddContinuationPacket(const std::vector<uint8_t>& buf) {
   size_t remaining_size = remaining_size_;
   std::unique_ptr<U2fContinuationPacket> cont_packet =
       U2fContinuationPacket::CreateFromSerializedData(buf, &remaining_size);
 
   // Reject packets with a different channel id
   if (cont_packet == nullptr || channel_id_ != cont_packet->channel_id())
     return false;
 
   remaining_size_ = remaining_size;
   packets_.push_back(std::move(cont_packet));
@@ skipping 13 matching lines @@
   }
 
   return data;
 }
 
 size_t U2fMessage::NumPackets() {
   return packets_.size();
 }
 
 }  // namespace device