Index: extensions/browser/extension_prefs.h |
diff --git a/extensions/browser/extension_prefs.h b/extensions/browser/extension_prefs.h |
index 940e30a28fc9ef48cc384c17b78777990b228b4e..bae2126e755715670b87d5f5e1af6f103330df54 100644 |
--- a/extensions/browser/extension_prefs.h |
+++ b/extensions/browser/extension_prefs.h |
@@ -5,13 +5,13 @@ |
#ifndef EXTENSIONS_BROWSER_EXTENSION_PREFS_H_ |
#define EXTENSIONS_BROWSER_EXTENSION_PREFS_H_ |
+#include <memory> |
#include <set> |
#include <string> |
#include <vector> |
#include "base/macros.h" |
#include "base/memory/linked_ptr.h" |
-#include "base/memory/scoped_ptr.h" |
#include "base/observer_list.h" |
#include "base/time/time.h" |
#include "base/values.h" |
@@ -146,7 +146,7 @@ class ExtensionPrefs : public ExtensionScopedPrefs, public KeyedService { |
ExtensionPrefValueMap* extension_pref_value_map, |
bool extensions_disabled, |
const std::vector<ExtensionPrefsObserver*>& early_observers, |
- scoped_ptr<TimeProvider> time_provider); |
+ std::unique_ptr<TimeProvider> time_provider); |
~ExtensionPrefs() override; |
@@ -356,7 +356,7 @@ class ExtensionPrefs : public ExtensionScopedPrefs, public KeyedService { |
// Returns the granted permission set for the extension with |extension_id|, |
// and NULL if no preferences were found for |extension_id|. |
// This passes ownership of the returned set to the caller. |
- scoped_ptr<const PermissionSet> GetGrantedPermissions( |
+ std::unique_ptr<const PermissionSet> GetGrantedPermissions( |
const std::string& extension_id) const; |
// Adds |permissions| to the granted permissions set for the extension with |
@@ -372,7 +372,7 @@ class ExtensionPrefs : public ExtensionScopedPrefs, public KeyedService { |
// Gets the active permission set for the specified extension. This may |
// differ from the permissions in the manifest due to the optional |
// permissions API. This passes ownership of the set to the caller. |
- scoped_ptr<const PermissionSet> GetActivePermissions( |
+ std::unique_ptr<const PermissionSet> GetActivePermissions( |
const std::string& extension_id) const; |
// Sets the active |permissions| for the extension with |extension_id|. |
@@ -413,15 +413,15 @@ class ExtensionPrefs : public ExtensionScopedPrefs, public KeyedService { |
// version directory and the location. Blacklisted extensions won't be saved |
// and neither will external extensions the user has explicitly uninstalled. |
// Caller takes ownership of returned structure. |
- scoped_ptr<ExtensionsInfo> GetInstalledExtensionsInfo() const; |
+ std::unique_ptr<ExtensionsInfo> GetInstalledExtensionsInfo() const; |
// Same as above, but only includes external extensions the user has |
// explicitly uninstalled. |
- scoped_ptr<ExtensionsInfo> GetUninstalledExtensionsInfo() const; |
+ std::unique_ptr<ExtensionsInfo> GetUninstalledExtensionsInfo() const; |
// Returns the ExtensionInfo from the prefs for the given extension. If the |
// extension is not present, NULL is returned. |
- scoped_ptr<ExtensionInfo> GetInstalledExtensionInfo( |
+ std::unique_ptr<ExtensionInfo> GetInstalledExtensionInfo( |
const std::string& extension_id) const; |
// We've downloaded an updated .crx file for the extension, but are waiting |
@@ -444,14 +444,14 @@ class ExtensionPrefs : public ExtensionScopedPrefs, public KeyedService { |
// Returns the ExtensionInfo from the prefs for delayed install information |
// for |extension_id|, if we have any. Otherwise returns NULL. |
- scoped_ptr<ExtensionInfo> GetDelayedInstallInfo( |
+ std::unique_ptr<ExtensionInfo> GetDelayedInstallInfo( |
const std::string& extension_id) const; |
DelayReason GetDelayedInstallReason(const std::string& extension_id) const; |
// Returns information about all the extensions that have delayed install |
// information. |
- scoped_ptr<ExtensionsInfo> GetAllDelayedInstallInfo() const; |
+ std::unique_ptr<ExtensionsInfo> GetAllDelayedInstallInfo() const; |
// Returns true if the user repositioned the app on the app launcher via drag |
// and drop. |
@@ -522,7 +522,7 @@ class ExtensionPrefs : public ExtensionScopedPrefs, public KeyedService { |
const base::DictionaryValue* GetGeometryCache( |
const std::string& extension_id) const; |
void SetGeometryCache(const std::string& extension_id, |
- scoped_ptr<base::DictionaryValue> cache); |
+ std::unique_ptr<base::DictionaryValue> cache); |
// Used for verification of installed extension ids. For the Set method, pass |
// null to remove the preference. |
@@ -562,7 +562,7 @@ class ExtensionPrefs : public ExtensionScopedPrefs, public KeyedService { |
PrefService* prefs, |
const base::FilePath& root_dir, |
ExtensionPrefValueMap* extension_pref_value_map, |
- scoped_ptr<TimeProvider> time_provider, |
+ std::unique_ptr<TimeProvider> time_provider, |
bool extensions_disabled, |
const std::vector<ExtensionPrefsObserver*>& early_observers); |
@@ -577,7 +577,7 @@ class ExtensionPrefs : public ExtensionScopedPrefs, public KeyedService { |
// Helper function used by GetInstalledExtensionInfo() and |
// GetDelayedInstallInfo() to construct an ExtensionInfo from the provided |
// |extension| dictionary. |
- scoped_ptr<ExtensionInfo> GetInstalledInfoHelper( |
+ std::unique_ptr<ExtensionInfo> GetInstalledInfoHelper( |
const std::string& extension_id, |
const base::DictionaryValue* extension) const; |
@@ -601,7 +601,7 @@ class ExtensionPrefs : public ExtensionScopedPrefs, public KeyedService { |
// Interprets |pref_key| in |extension_id|'s preferences as an |
// PermissionSet, and passes ownership of the set to the caller. |
- scoped_ptr<const PermissionSet> ReadPrefAsPermissionSet( |
+ std::unique_ptr<const PermissionSet> ReadPrefAsPermissionSet( |
const std::string& extension_id, |
const std::string& pref_key) const; |
@@ -682,7 +682,7 @@ class ExtensionPrefs : public ExtensionScopedPrefs, public KeyedService { |
// Weak pointer, owned by BrowserContext. |
ExtensionPrefValueMap* extension_pref_value_map_; |
- scoped_ptr<TimeProvider> time_provider_; |
+ std::unique_ptr<TimeProvider> time_provider_; |
bool extensions_disabled_; |