Convert chrome/common to std::unique_ptr

chrome/common/extensions/api/commands/commands_handler.cc

 // Copyright (c) 2013 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 "chrome/common/extensions/api/commands/commands_handler.h"
 
+#include <memory>
+
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/common/extensions/command.h"
 #include "extensions/common/error_utils.h"
 #include "extensions/common/manifest_constants.h"
 #include "extensions/common/manifest_handlers/permissions_parser.h"
 
 namespace extensions {
 
@@ skipping 34 matching lines @@
 }
 
 CommandsHandler::CommandsHandler() {
 }
 
 CommandsHandler::~CommandsHandler() {
 }
 
 bool CommandsHandler::Parse(Extension* extension, base::string16* error) {
   if (!extension->manifest()->HasKey(keys::kCommands)) {
-    scoped_ptr<CommandsInfo> commands_info(new CommandsInfo);
+    std::unique_ptr<CommandsInfo> commands_info(new CommandsInfo);
     MaybeSetBrowserActionDefault(extension, commands_info.get());
     extension->SetManifestData(keys::kCommands,
                                commands_info.release());
     return true;
   }
 
   const base::DictionaryValue* dict = NULL;
   if (!extension->manifest()->GetDictionary(keys::kCommands, &dict)) {
     *error = base::ASCIIToUTF16(manifest_errors::kInvalidCommandsKey);
     return false;
   }
 
-  scoped_ptr<CommandsInfo> commands_info(new CommandsInfo);
+  std::unique_ptr<CommandsInfo> commands_info(new CommandsInfo);
 
   int command_index = 0;
   int keybindings_found = 0;
   for (base::DictionaryValue::Iterator iter(*dict); !iter.IsAtEnd();
        iter.Advance()) {
     ++command_index;
 
     const base::DictionaryValue* command = NULL;
     if (!iter.value().GetAsDictionary(&command)) {
       *error = ErrorUtils::FormatErrorMessageUTF16(
           manifest_errors::kInvalidKeyBindingDictionary,
           base::IntToString(command_index));
       return false;
     }
 
-    scoped_ptr<extensions::Command> binding(new Command());
+    std::unique_ptr<extensions::Command> binding(new Command());
     if (!binding->Parse(command, iter.key(), command_index, error))
       return false;  // |error| already set.
 
     if (binding->accelerator().key_code() != ui::VKEY_UNKNOWN) {
       // Only media keys are allowed to work without modifiers, and because
       // media keys aren't registered exclusively they should not count towards
       // the max of four shortcuts per extension.
       if (!Command::IsMediaKey(binding->accelerator()))
         ++keybindings_found;
 
@@ skipping 42 matching lines @@
                     std::string(),
                     false));
   }
 }
 
 const std::vector<std::string> CommandsHandler::Keys() const {
   return SingleKey(keys::kCommands);
 }
 
 }  // namespace extensions