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

Unified Diff: remoting/host/policy_hack/policy_watcher_linux.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/policy_hack/policy_watcher_linux.cc
diff --git a/remoting/host/policy_hack/policy_watcher_linux.cc b/remoting/host/policy_hack/policy_watcher_linux.cc
index 293155aa6ddfd231e8dbff4b6e3b0e22ac71c095..75a654125f63fbca8deb50fa5e8059d2d9272440 100644
--- a/remoting/host/policy_hack/policy_watcher_linux.cc
+++ b/remoting/host/policy_hack/policy_watcher_linux.cc
@@ -149,12 +149,12 @@ class PolicyWatcherLinux : public PolicyWatcher {
if (!value.get()) {
LOG(WARNING) << "Failed to read configuration file "
<< config_file_iter->value() << ": " << error_msg;
- return scoped_ptr<base::DictionaryValue>();
+ return nullptr;
}
if (!value->IsType(base::Value::TYPE_DICTIONARY)) {
LOG(WARNING) << "Expected JSON dictionary in configuration file "
<< config_file_iter->value();
- return scoped_ptr<base::DictionaryValue>();
+ return nullptr;
}
policy->MergeDictionary(static_cast<base::DictionaryValue*>(value.get()));
}

Powered by Google App Engine
This is Rietveld 408576698