summaryrefslogtreecommitdiffstats
path: root/cloud_print
diff options
context:
space:
mode:
authorbauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-06 13:33:04 +0000
committerbauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-06 13:33:04 +0000
commitd814a88597a01bf8249e36983f55a5f880154642 (patch)
treeb38b92bb3f3dd40285f1a5d652f3c8c6609e4279 /cloud_print
parentbc00c1d1ae16e1cd82430320d89daaaaea5ded67 (diff)
downloadchromium_src-d814a88597a01bf8249e36983f55a5f880154642.zip
chromium_src-d814a88597a01bf8249e36983f55a5f880154642.tar.gz
chromium_src-d814a88597a01bf8249e36983f55a5f880154642.tar.bz2
Make element removal methods in DictionaryValue and ListValue take scoped_ptr's as outparams.
TBR=pneubeck@chromium.org,scottbyer@chromium.org BUG=263894 Review URL: https://chromiumcodereview.appspot.com/21030009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@215885 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cloud_print')
-rw-r--r--cloud_print/service/win/chrome_launcher.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/cloud_print/service/win/chrome_launcher.cc b/cloud_print/service/win/chrome_launcher.cc
index 1d7b26d..6e3366a 100644
--- a/cloud_print/service/win/chrome_launcher.cc
+++ b/cloud_print/service/win/chrome_launcher.cc
@@ -139,10 +139,10 @@ std::string ReadAndUpdateServiceState(const base::FilePath& directory,
}
// Remove everything except kCloudPrintRoot.
- base::Value* cloud_print_root = NULL;
+ scoped_ptr<base::Value> cloud_print_root;
dictionary->Remove(prefs::kCloudPrintRoot, &cloud_print_root);
dictionary->Clear();
- dictionary->Set(prefs::kCloudPrintRoot, cloud_print_root);
+ dictionary->Set(prefs::kCloudPrintRoot, cloud_print_root.release());
dictionary->SetBoolean(prefs::kCloudPrintXmppPingEnabled, true);
if (!proxy_id.empty()) // Reuse proxy id if we already had one.