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

Unified Diff: extensions/common/extension_messages.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
« no previous file with comments | « extensions/common/extension_messages.h ('k') | extensions/common/extension_set_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/common/extension_messages.cc
diff --git a/extensions/common/extension_messages.cc b/extensions/common/extension_messages.cc
index c648b28a8dbc1cdffa4746332b4c55d5e8635d69..9f51c08e48054e5132ec1adc4a6670f448f6f68e 100644
--- a/extensions/common/extension_messages.cc
+++ b/extensions/common/extension_messages.cc
@@ -6,6 +6,9 @@
#include <stddef.h>
+#include <memory>
+
+#include "base/memory/ptr_util.h"
#include "content/public/common/common_param_traits.h"
#include "extensions/common/extension.h"
#include "extensions/common/manifest.h"
@@ -41,10 +44,10 @@ ExtensionMsg_PermissionSetStruct::ExtensionMsg_PermissionSetStruct(
ExtensionMsg_PermissionSetStruct::~ExtensionMsg_PermissionSetStruct() {
}
-scoped_ptr<const PermissionSet>
+std::unique_ptr<const PermissionSet>
ExtensionMsg_PermissionSetStruct::ToPermissionSet() const {
- return make_scoped_ptr(new PermissionSet(apis, manifest_permissions,
- explicit_hosts, scriptable_hosts));
+ return base::WrapUnique(new PermissionSet(apis, manifest_permissions,
+ explicit_hosts, scriptable_hosts));
}
ExtensionMsg_Loaded_Params::ExtensionMsg_Loaded_Params()
@@ -214,7 +217,7 @@ bool ParamTraits<APIPermissionSet>::Read(const base::Pickle* m,
extensions::PermissionsInfo::GetInstance()->GetByID(id);
if (!permission_info)
return false;
- scoped_ptr<APIPermission> p(permission_info->CreateAPIPermission());
+ std::unique_ptr<APIPermission> p(permission_info->CreateAPIPermission());
if (!p->Read(m, iter))
return false;
r->insert(p.release());
@@ -248,7 +251,8 @@ bool ParamTraits<ManifestPermissionSet>::Read(const base::Pickle* m,
std::string name;
if (!ReadParam(m, iter, &name))
return false;
- scoped_ptr<ManifestPermission> p(ManifestHandler::CreatePermission(name));
+ std::unique_ptr<ManifestPermission> p(
+ ManifestHandler::CreatePermission(name));
if (!p)
return false;
if (!p->Read(m, iter))
« no previous file with comments | « extensions/common/extension_messages.h ('k') | extensions/common/extension_set_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698