Convert //components/proximity_auth from scoped_ptr to std::unique_ptr

components/proximity_auth/wire_message.cc

 // Copyright 2014 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 "components/proximity_auth/wire_message.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <limits>
 
 #include "base/base64url.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/macros.h"
+#include "base/memory/ptr_util.h"
 #include "base/values.h"
 #include "components/proximity_auth/logging/logging.h"
 
 // The wire messages have a simple format:
 // [ message version ] [ body length ] [ JSON body ]
 //       1 byte            2 bytes      body length
 // The JSON body contains two fields: an optional permit_id field and a required
 // data field.
 
 namespace proximity_auth {
@@ skipping 46 matching lines @@
 
   return true;
 }
 
 }  // namespace
 
 WireMessage::~WireMessage() {
 }
 
 // static
-scoped_ptr<WireMessage> WireMessage::Deserialize(
+std::unique_ptr<WireMessage> WireMessage::Deserialize(
     const std::string& serialized_message,
     bool* is_incomplete_message) {
   if (!ParseHeader(serialized_message, is_incomplete_message))
-    return scoped_ptr<WireMessage>();
+    return std::unique_ptr<WireMessage>();
 
-  scoped_ptr<base::Value> body_value =
+  std::unique_ptr<base::Value> body_value =
       base::JSONReader::Read(serialized_message.substr(kHeaderLength));
   if (!body_value || !body_value->IsType(base::Value::TYPE_DICTIONARY)) {
     PA_LOG(WARNING) << "Error: Unable to parse message as JSON.";
-    return scoped_ptr<WireMessage>();
+    return std::unique_ptr<WireMessage>();
   }
 
   base::DictionaryValue* body;
   bool success = body_value->GetAsDictionary(&body);
   DCHECK(success);
 
   // The permit ID is optional. In the Easy Unlock protocol, only the first
   // message includes this field.
   std::string permit_id;
   body->GetString(kPermitIdKey, &permit_id);
 
   std::string payload_base64;
   if (!body->GetString(kPayloadKey, &payload_base64) ||
       payload_base64.empty()) {
     PA_LOG(WARNING) << "Error: Missing payload.";
-    return scoped_ptr<WireMessage>();
+    return std::unique_ptr<WireMessage>();
   }
 
   std::string payload;
   if (!base::Base64UrlDecode(payload_base64,
                              base::Base64UrlDecodePolicy::REQUIRE_PADDING,
                              &payload)) {
     PA_LOG(WARNING) << "Error: Invalid base64 encoding for payload.";
-    return scoped_ptr<WireMessage>();
+    return std::unique_ptr<WireMessage>();
   }
 
-  return make_scoped_ptr(new WireMessage(payload, permit_id));
+  return base::WrapUnique(new WireMessage(payload, permit_id));
 }
 
 std::string WireMessage::Serialize() const {
   if (payload_.empty()) {
     PA_LOG(ERROR) << "Failed to serialize empty wire message.";
     return std::string();
   }
 
   // Create JSON body containing permit id and payload.
   base::DictionaryValue body;
@@ skipping 32 matching lines @@
 }
 
 WireMessage::WireMessage(const std::string& payload)
     : WireMessage(payload, std::string()) {}
 
 WireMessage::WireMessage(const std::string& payload,
                          const std::string& permit_id)
     : payload_(payload), permit_id_(permit_id) {}
 
 }  // namespace proximity_auth