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

Unified Diff: remoting/host/pairing_registry_delegate_win.cc

Issue 609923004: Cleanup usage of scoped_ptr<> in remoting for C++11 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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: remoting/host/pairing_registry_delegate_win.cc
diff --git a/remoting/host/pairing_registry_delegate_win.cc b/remoting/host/pairing_registry_delegate_win.cc
index b4b89b2097c987d702bcd3f83ec34bc5696bf977..ca814b23b4a9c392e779a1bc8a7eaac37156eb38 100644
--- a/remoting/host/pairing_registry_delegate_win.cc
+++ b/remoting/host/pairing_registry_delegate_win.cc
@@ -44,7 +44,7 @@ scoped_ptr<base::DictionaryValue> ReadValue(const base::win::RegKey& key,
if (result != ERROR_SUCCESS) {
SetLastError(result);
PLOG(ERROR) << "Cannot read value '" << value_name << "'";
- return scoped_ptr<base::DictionaryValue>();
+ return nullptr;
}
// Parse the value.
@@ -57,12 +57,12 @@ scoped_ptr<base::DictionaryValue> ReadValue(const base::win::RegKey& key,
if (!value) {
LOG(ERROR) << "Failed to parse '" << value_name << "': " << error_message
<< " (" << error_code << ").";
- return scoped_ptr<base::DictionaryValue>();
+ return nullptr;
}
if (value->GetType() != base::Value::TYPE_DICTIONARY) {
LOG(ERROR) << "Failed to parse '" << value_name << "': not a dictionary.";
- return scoped_ptr<base::DictionaryValue>();
+ return nullptr;
}
return scoped_ptr<base::DictionaryValue>(

Powered by Google App Engine
This is Rietveld 408576698