Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(695)

Unified Diff: extensions/common/manifest_handlers/content_capabilities_handler.cc

Issue 1908953003: Convert //extensions/{common,shell} from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase? Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: extensions/common/manifest_handlers/content_capabilities_handler.cc
diff --git a/extensions/common/manifest_handlers/content_capabilities_handler.cc b/extensions/common/manifest_handlers/content_capabilities_handler.cc
index cfae3120c742e7c478c035915903af0f343d5b8c..d3040176c0da01500107486e343e922561cfc94f 100644
--- a/extensions/common/manifest_handlers/content_capabilities_handler.cc
+++ b/extensions/common/manifest_handlers/content_capabilities_handler.cc
@@ -4,9 +4,10 @@
#include "extensions/common/manifest_handlers/content_capabilities_handler.h"
+#include <memory>
+
#include "base/command_line.h"
#include "base/lazy_instance.h"
-#include "base/memory/scoped_ptr.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/utf_string_conversions.h"
#include "base/values.h"
@@ -50,7 +51,7 @@ ContentCapabilitiesHandler::~ContentCapabilitiesHandler() {
bool ContentCapabilitiesHandler::Parse(Extension* extension,
base::string16* error) {
- scoped_ptr<ContentCapabilitiesInfo> info(new ContentCapabilitiesInfo);
+ std::unique_ptr<ContentCapabilitiesInfo> info(new ContentCapabilitiesInfo);
const base::Value* value = NULL;
if (!extension->manifest()->Get(keys::kContentCapabilities, &value)) {
@@ -58,8 +59,8 @@ bool ContentCapabilitiesHandler::Parse(Extension* extension,
return false;
}
- scoped_ptr<ContentCapabilities> capabilities(ContentCapabilities::FromValue(
- *value, error));
+ std::unique_ptr<ContentCapabilities> capabilities(
+ ContentCapabilities::FromValue(*value, error));
if (!capabilities)
return false;
« no previous file with comments | « extensions/common/manifest_handlers/background_info.cc ('k') | extensions/common/manifest_handlers/csp_info.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698