Index: extensions/common/manifest_handlers/webview_info.cc |
diff --git a/extensions/common/manifest_handlers/webview_info.cc b/extensions/common/manifest_handlers/webview_info.cc |
index 6775c754dbc151b64d06538977488a91175b3d43..989df762b45c2cdbd167bcb855618952c5230a20 100644 |
--- a/extensions/common/manifest_handlers/webview_info.cc |
+++ b/extensions/common/manifest_handlers/webview_info.cc |
@@ -6,9 +6,9 @@ |
#include <stddef.h> |
+#include <memory> |
#include <utility> |
-#include "base/memory/scoped_ptr.h" |
#include "base/strings/pattern.h" |
#include "base/strings/string_number_conversions.h" |
#include "base/strings/string_util.h" |
@@ -86,7 +86,7 @@ bool WebviewInfo::IsResourceWebviewAccessible( |
return false; |
} |
-void WebviewInfo::AddPartitionItem(scoped_ptr<PartitionItem> item) { |
+void WebviewInfo::AddPartitionItem(std::unique_ptr<PartitionItem> item) { |
partition_items_.push_back(std::move(item)); |
} |
@@ -97,7 +97,7 @@ WebviewHandler::~WebviewHandler() { |
} |
bool WebviewHandler::Parse(Extension* extension, base::string16* error) { |
- scoped_ptr<WebviewInfo> info(new WebviewInfo(extension->id())); |
+ std::unique_ptr<WebviewInfo> info(new WebviewInfo(extension->id())); |
const base::DictionaryValue* dict_value = NULL; |
if (!extension->manifest()->GetDictionary(keys::kWebview, |
@@ -148,7 +148,7 @@ bool WebviewHandler::Parse(Extension* extension, base::string16* error) { |
return false; |
} |
- scoped_ptr<PartitionItem> partition_item( |
+ std::unique_ptr<PartitionItem> partition_item( |
new PartitionItem(partition_pattern)); |
for (size_t i = 0; i < url_list->GetSize(); ++i) { |