| Index: chrome/browser/extensions/permissions_updater.h
|
| diff --git a/chrome/browser/extensions/permissions_updater.h b/chrome/browser/extensions/permissions_updater.h
|
| index fb5b5631a225eedb3fa1d9984678c5ef3f06ff59..2bb6f8fe2f9d62149afdbffad1b3e4e0f051ed2d 100644
|
| --- a/chrome/browser/extensions/permissions_updater.h
|
| +++ b/chrome/browser/extensions/permissions_updater.h
|
| @@ -5,10 +5,10 @@
|
| #ifndef CHROME_BROWSER_EXTENSIONS_PERMISSIONS_UPDATER_H__
|
| #define CHROME_BROWSER_EXTENSIONS_PERMISSIONS_UPDATER_H__
|
|
|
| +#include <memory>
|
| #include <string>
|
|
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "extensions/browser/extension_event_histogram_value.h"
|
|
|
| namespace base {
|
| @@ -70,7 +70,7 @@ class PermissionsUpdater {
|
| const PermissionSet& permissions);
|
|
|
| // Returns the set of revokable permissions.
|
| - scoped_ptr<const PermissionSet> GetRevokablePermissions(
|
| + std::unique_ptr<const PermissionSet> GetRevokablePermissions(
|
| const Extension* extension) const;
|
|
|
| // Adds all permissions in the |extension|'s active permissions to its
|
| @@ -93,8 +93,8 @@ class PermissionsUpdater {
|
| // withheld permissions to |withheld|. Otherwise, |withheld| permissions are
|
| // not changed.
|
| void SetPermissions(const Extension* extension,
|
| - scoped_ptr<const PermissionSet> active,
|
| - scoped_ptr<const PermissionSet> withheld);
|
| + std::unique_ptr<const PermissionSet> active,
|
| + std::unique_ptr<const PermissionSet> withheld);
|
|
|
| // Dispatches specified event to the extension.
|
| void DispatchEvent(const std::string& extension_id,
|
|
|