| Index: extensions/common/extension.h
|
| diff --git a/extensions/common/extension.h b/extensions/common/extension.h
|
| index 13a86b74e560e49d2d6b007ae21946e45092cd24..278a8c488bb30f4de4ea0ca92b198125151cb939 100644
|
| --- a/extensions/common/extension.h
|
| +++ b/extensions/common/extension.h
|
| @@ -6,6 +6,7 @@
|
| #define EXTENSIONS_COMMON_EXTENSION_H_
|
|
|
| #include <map>
|
| +#include <memory>
|
| #include <set>
|
| #include <string>
|
| #include <vector>
|
| @@ -14,7 +15,6 @@
|
| #include "base/macros.h"
|
| #include "base/memory/linked_ptr.h"
|
| #include "base/memory/ref_counted.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/threading/thread_checker.h"
|
| #include "extensions/common/extension_resource.h"
|
| #include "extensions/common/install_warning.h"
|
| @@ -359,7 +359,7 @@ class Extension : public base::RefCountedThreadSafe<Extension> {
|
| base::string16* error);
|
|
|
| Extension(const base::FilePath& path,
|
| - scoped_ptr<extensions::Manifest> manifest);
|
| + std::unique_ptr<extensions::Manifest> manifest);
|
| virtual ~Extension();
|
|
|
| // Initialize the extension from a parsed manifest.
|
| @@ -424,10 +424,10 @@ class Extension : public base::RefCountedThreadSafe<Extension> {
|
| // The parser for the manifest's permissions. This is NULL anytime not during
|
| // initialization.
|
| // TODO(rdevlin.cronin): This doesn't really belong here.
|
| - scoped_ptr<PermissionsParser> permissions_parser_;
|
| + std::unique_ptr<PermissionsParser> permissions_parser_;
|
|
|
| // The active permissions for the extension.
|
| - scoped_ptr<PermissionsData> permissions_data_;
|
| + std::unique_ptr<PermissionsData> permissions_data_;
|
|
|
| // Any warnings that occurred when trying to create/parse the extension.
|
| std::vector<InstallWarning> install_warnings_;
|
| @@ -436,7 +436,7 @@ class Extension : public base::RefCountedThreadSafe<Extension> {
|
| GURL extension_url_;
|
|
|
| // The extension's version.
|
| - scoped_ptr<base::Version> version_;
|
| + std::unique_ptr<base::Version> version_;
|
|
|
| // The extension's user visible version name.
|
| std::string version_name_;
|
| @@ -452,10 +452,10 @@ class Extension : public base::RefCountedThreadSafe<Extension> {
|
| std::string public_key_;
|
|
|
| // The manifest from which this extension was created.
|
| - scoped_ptr<Manifest> manifest_;
|
| + std::unique_ptr<Manifest> manifest_;
|
|
|
| // Stored parsed manifest data.
|
| - using ManifestDataMap = std::map<std::string, scoped_ptr<ManifestData>>;
|
| + using ManifestDataMap = std::map<std::string, std::unique_ptr<ManifestData>>;
|
| ManifestDataMap manifest_data_;
|
|
|
| // Set to true at the end of InitValue when initialization is finished.
|
| @@ -495,7 +495,7 @@ struct ExtensionInfo {
|
| Manifest::Location location);
|
| ~ExtensionInfo();
|
|
|
| - scoped_ptr<base::DictionaryValue> extension_manifest;
|
| + std::unique_ptr<base::DictionaryValue> extension_manifest;
|
| ExtensionId extension_id;
|
| base::FilePath extension_path;
|
| Manifest::Location extension_location;
|
|
|