Index: chrome/browser/extensions/api/permissions/permissions_api_helpers.h |
diff --git a/chrome/browser/extensions/api/permissions/permissions_api_helpers.h b/chrome/browser/extensions/api/permissions/permissions_api_helpers.h |
index 89e866a8cf4eb2084565edbb3328ff5a195869c3..4e06564f3215ea64b30e102756c00f3f592ed436 100644 |
--- a/chrome/browser/extensions/api/permissions/permissions_api_helpers.h |
+++ b/chrome/browser/extensions/api/permissions/permissions_api_helpers.h |
@@ -5,8 +5,9 @@ |
#ifndef CHROME_BROWSER_EXTENSIONS_API_PERMISSIONS_PERMISSIONS_API_HELPERS_H_ |
#define CHROME_BROWSER_EXTENSIONS_API_PERMISSIONS_PERMISSIONS_API_HELPERS_H_ |
+#include <memory> |
#include <string> |
-#include "base/memory/scoped_ptr.h" |
+ |
#include "base/memory/ref_counted.h" |
namespace base { |
@@ -26,12 +27,12 @@ struct Permissions; |
namespace permissions_api_helpers { |
// Converts the permission |set| to a permissions object. |
-scoped_ptr<api::permissions::Permissions> PackPermissionSet( |
+std::unique_ptr<api::permissions::Permissions> PackPermissionSet( |
const PermissionSet& set); |
// Creates a permission set from |permissions|. Returns NULL if the permissions |
// cannot be converted to a permission set, in which case |error| will be set. |
-scoped_ptr<const PermissionSet> UnpackPermissionSet( |
+std::unique_ptr<const PermissionSet> UnpackPermissionSet( |
const api::permissions::Permissions& permissions, |
bool allow_file_access, |
std::string* error); |