Convert chrome/common to std::unique_ptr

chrome/common/extensions/manifest_handlers/ui_overrides_handler.cc

 // Copyright 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/manifest_handlers/ui_overrides_handler.h"
 
-#include "base/memory/scoped_ptr.h"
+#include <memory>
+
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/grit/generated_resources.h"
 #include "extensions/common/error_utils.h"
 #include "extensions/common/feature_switch.h"
 #include "extensions/common/manifest_constants.h"
 #include "extensions/common/permissions/manifest_permission.h"
 #include "extensions/common/permissions/permissions_data.h"
 #include "extensions/common/permissions/permissions_info.h"
@@ skipping 24 matching lines @@
       // IDS_EXTENSION_PROMPT_WARNING_OVERRIDE_BOOKMARKS_UI
       permissions.insert(APIPermission::kOverrideBookmarksUI);
     }
     return permissions;
   }
 
   bool FromValue(const base::Value* value) override {
     return value && value->GetAsBoolean(&override_bookmarks_ui_permission_);
   }
 
-  scoped_ptr<base::Value> ToValue() const override {
-    return scoped_ptr<base::Value>(
+  std::unique_ptr<base::Value> ToValue() const override {
+    return std::unique_ptr<base::Value>(
         new base::FundamentalValue(override_bookmarks_ui_permission_));
   }
 
   ManifestPermission* Diff(const ManifestPermission* rhs) const override {
     const ManifestPermissionImpl* other =
         static_cast<const ManifestPermissionImpl*>(rhs);
 
-    return scoped_ptr<ManifestPermissionImpl>(new ManifestPermissionImpl(
-        override_bookmarks_ui_permission_ &&
-        !other->override_bookmarks_ui_permission_)).release();
+    return std::unique_ptr<ManifestPermissionImpl>(
+               new ManifestPermissionImpl(
+                   override_bookmarks_ui_permission_ &&
+                   !other->override_bookmarks_ui_permission_))
+        .release();
   }
 
   ManifestPermission* Union(const ManifestPermission* rhs) const override {
     const ManifestPermissionImpl* other =
         static_cast<const ManifestPermissionImpl*>(rhs);
 
-    return scoped_ptr<ManifestPermissionImpl>(new ManifestPermissionImpl(
-        override_bookmarks_ui_permission_ ||
-        other->override_bookmarks_ui_permission_)).release();
+    return std::unique_ptr<ManifestPermissionImpl>(
+               new ManifestPermissionImpl(
+                   override_bookmarks_ui_permission_ ||
+                   other->override_bookmarks_ui_permission_))
+        .release();
   }
 
   ManifestPermission* Intersect(const ManifestPermission* rhs) const override {
     const ManifestPermissionImpl* other =
         static_cast<const ManifestPermissionImpl*>(rhs);
 
-    return scoped_ptr<ManifestPermissionImpl>(new ManifestPermissionImpl(
-        override_bookmarks_ui_permission_ &&
-        other->override_bookmarks_ui_permission_)).release();
+    return std::unique_ptr<ManifestPermissionImpl>(
+               new ManifestPermissionImpl(
+                   override_bookmarks_ui_permission_ &&
+                   other->override_bookmarks_ui_permission_))
+        .release();
   }
 
  private:
   bool override_bookmarks_ui_permission_;
 };
 
 UIOverrides::UIOverrides() {}
 
 UIOverrides::~UIOverrides() {}
 
@@ skipping 23 matching lines @@
       *ui_overrides->bookmarks_ui->remove_bookmark_open_pages_shortcut;
 }
 
 UIOverridesHandler::UIOverridesHandler() {}
 
 UIOverridesHandler::~UIOverridesHandler() {}
 
 bool UIOverridesHandler::Parse(Extension* extension, base::string16* error) {
   const base::Value* dict = NULL;
   CHECK(extension->manifest()->Get(manifest_keys::kUIOverride, &dict));
-  scoped_ptr<ChromeUIOverrides> overrides(
+  std::unique_ptr<ChromeUIOverrides> overrides(
       ChromeUIOverrides::FromValue(*dict, error));
   if (!overrides)
     return false;
 
-  scoped_ptr<UIOverrides> info(new UIOverrides);
+  std::unique_ptr<UIOverrides> info(new UIOverrides);
   info->bookmarks_ui.swap(overrides->bookmarks_ui);
   if (!info->bookmarks_ui) {
     *error = ErrorUtils::FormatErrorMessageUTF16(
         manifest_errors::kInvalidEmptyDictionary,
         manifest_keys::kUIOverride);
     return false;
   }
   info->manifest_permission.reset(new ManifestPermissionImpl(
       info->bookmarks_ui.get() != NULL));
   extension->SetManifestData(manifest_keys::kUIOverride, info.release());
@@ skipping 27 matching lines @@
   const UIOverrides* data = UIOverrides::Get(extension);
   if (data)
     return data->manifest_permission->Clone();
   return NULL;
 }
 const std::vector<std::string> UIOverridesHandler::Keys() const {
   return SingleKey(manifest_keys::kUIOverride);
 }
 
 }  // namespace extensions