| Index: chrome/browser/extensions/api/messaging/native_messaging_host_manifest.cc
|
| diff --git a/chrome/browser/extensions/api/messaging/native_messaging_host_manifest.cc b/chrome/browser/extensions/api/messaging/native_messaging_host_manifest.cc
|
| index 34e87c2c3682ee50f9ae8723f06bab77486843c7..27a6f99a2c18a37b2a1c3a358e2ed7689836bf71 100644
|
| --- a/chrome/browser/extensions/api/messaging/native_messaging_host_manifest.cc
|
| +++ b/chrome/browser/extensions/api/messaging/native_messaging_host_manifest.cc
|
| @@ -40,28 +40,28 @@ bool NativeMessagingHostManifest::IsValidName(const std::string& name) {
|
| }
|
|
|
| // static
|
| -scoped_ptr<NativeMessagingHostManifest> NativeMessagingHostManifest::Load(
|
| +std::unique_ptr<NativeMessagingHostManifest> NativeMessagingHostManifest::Load(
|
| const base::FilePath& file_path,
|
| std::string* error_message) {
|
| DCHECK(error_message);
|
|
|
| JSONFileValueDeserializer deserializer(file_path);
|
| - scoped_ptr<base::Value> parsed =
|
| + std::unique_ptr<base::Value> parsed =
|
| deserializer.Deserialize(NULL, error_message);
|
| if (!parsed) {
|
| - return scoped_ptr<NativeMessagingHostManifest>();
|
| + return std::unique_ptr<NativeMessagingHostManifest>();
|
| }
|
|
|
| base::DictionaryValue* dictionary;
|
| if (!parsed->GetAsDictionary(&dictionary)) {
|
| *error_message = "Invalid manifest file.";
|
| - return scoped_ptr<NativeMessagingHostManifest>();
|
| + return std::unique_ptr<NativeMessagingHostManifest>();
|
| }
|
|
|
| - scoped_ptr<NativeMessagingHostManifest> result(
|
| + std::unique_ptr<NativeMessagingHostManifest> result(
|
| new NativeMessagingHostManifest());
|
| if (!result->Parse(dictionary, error_message)) {
|
| - return scoped_ptr<NativeMessagingHostManifest>();
|
| + return std::unique_ptr<NativeMessagingHostManifest>();
|
| }
|
|
|
| return result;
|
|
|