Convert //url to use std::unique_ptr

content/renderer/manifest/manifest_parser.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 "content/renderer/manifest/manifest_parser.h"
 
 #include <stddef.h>
 
 #include "base/json/json_reader.h"
+#include "base/memory/ptr_util.h"
 #include "base/strings/nullable_string16.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "content/public/common/manifest.h"
 #include "content/renderer/manifest/manifest_uma_util.h"
 #include "third_party/WebKit/public/platform/WebColor.h"
 #include "third_party/WebKit/public/platform/WebString.h"
@@ skipping 81 matching lines @@
       failed_(false) {
 }
 
 ManifestParser::~ManifestParser() {
 }
 
 void ManifestParser::Parse() {
   std::string error_msg;
   int error_line = 0;
   int error_column = 0;
-  scoped_ptr<base::Value> value = base::JSONReader::ReadAndReturnError(
+  std::unique_ptr<base::Value> value = base::JSONReader::ReadAndReturnError(
       data_, base::JSON_PARSE_RFC, nullptr, &error_msg, &error_line,
       &error_column);
 
   if (!value) {
     AddErrorInfo(GetErrorPrefix() + error_msg, error_line, error_column);
     ManifestUmaUtil::ParseFailed();
     failed_ = true;
     return;
   }
 
@@ skipping 20 matching lines @@
   manifest_.background_color = ParseBackgroundColor(*dictionary);
   manifest_.gcm_sender_id = ParseGCMSenderID(*dictionary);
 
   ManifestUmaUtil::ParseSucceeded(manifest_);
 }
 
 const Manifest& ManifestParser::manifest() const {
   return manifest_;
 }
 
-const std::vector<scoped_ptr<ManifestParser::ErrorInfo>>&
+const std::vector<std::unique_ptr<ManifestParser::ErrorInfo>>&
 ManifestParser::errors() const {
   return errors_;
 }
 
 bool ManifestParser::failed() const {
   return failed_;
 }
 
 bool ManifestParser::ParseBoolean(const base::DictionaryValue& dictionary,
                                   const std::string& key,
@@ skipping 290 matching lines @@
 
 base::NullableString16 ManifestParser::ParseGCMSenderID(
     const base::DictionaryValue& dictionary)  {
   return ParseString(dictionary, "gcm_sender_id", Trim);
 }
 
 void ManifestParser::AddErrorInfo(const std::string& error_msg,
                                   int error_line,
                                   int error_column) {
   errors_.push_back(
-      make_scoped_ptr(new ErrorInfo(error_msg, error_line, error_column)));
+      base::WrapUnique(new ErrorInfo(error_msg, error_line, error_column)));
 }
 } // namespace content