Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6339)

Unified Diff: chrome/browser/extensions/api/messaging/native_messaging_host_manifest.cc

Issue 1871713002: Convert //chrome/browser/extensions from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase and fix header Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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;

Powered by Google App Engine
This is Rietveld 408576698