Index: chrome/browser/extensions/component_loader.cc |
diff --git a/chrome/browser/extensions/component_loader.cc b/chrome/browser/extensions/component_loader.cc |
index d386f9d1741629985c4075206af7e60158c189d7..932ebbddc569f55fae33e6cb600621cf6e860216 100644 |
--- a/chrome/browser/extensions/component_loader.cc |
+++ b/chrome/browser/extensions/component_loader.cc |
@@ -92,13 +92,12 @@ std::string GenerateId(const base::DictionaryValue* manifest, |
} |
#if defined(OS_CHROMEOS) |
-scoped_ptr<base::DictionaryValue> |
-LoadManifestOnFileThread( |
+std::unique_ptr<base::DictionaryValue> LoadManifestOnFileThread( |
const base::FilePath& root_directory, |
const base::FilePath::CharType* manifest_filename) { |
DCHECK_CURRENTLY_ON(content::BrowserThread::FILE); |
std::string error; |
- scoped_ptr<base::DictionaryValue> manifest( |
+ std::unique_ptr<base::DictionaryValue> manifest( |
file_util::LoadManifest(root_directory, manifest_filename, &error)); |
if (!manifest) { |
LOG(ERROR) << "Can't load " |
@@ -163,7 +162,7 @@ void ComponentLoader::LoadAll() { |
base::DictionaryValue* ComponentLoader::ParseManifest( |
const std::string& manifest_contents) const { |
JSONStringValueDeserializer deserializer(manifest_contents); |
- scoped_ptr<base::Value> manifest = deserializer.Deserialize(NULL, NULL); |
+ std::unique_ptr<base::Value> manifest = deserializer.Deserialize(NULL, NULL); |
if (!manifest.get() || !manifest->IsType(base::Value::TYPE_DICTIONARY)) { |
LOG(ERROR) << "Failed to parse extension manifest."; |
@@ -242,7 +241,7 @@ std::string ComponentLoader::Add(const base::DictionaryValue* parsed_manifest, |
std::string ComponentLoader::AddOrReplace(const base::FilePath& path) { |
base::FilePath absolute_path = base::MakeAbsoluteFilePath(path); |
std::string error; |
- scoped_ptr<base::DictionaryValue> manifest( |
+ std::unique_ptr<base::DictionaryValue> manifest( |
file_util::LoadManifest(absolute_path, &error)); |
if (!manifest) { |
LOG(ERROR) << "Could not load extension from '" << |
@@ -784,7 +783,7 @@ void ComponentLoader::FinishAddWithManifestFile( |
const base::FilePath& root_directory, |
const char* extension_id, |
const base::Closure& done_cb, |
- scoped_ptr<base::DictionaryValue> manifest) { |
+ std::unique_ptr<base::DictionaryValue> manifest) { |
DCHECK_CURRENTLY_ON(content::BrowserThread::UI); |
if (!manifest) |
return; // Error already logged. |