Make DictionaryValue::DeepCopyWithoutEmptyChildren return a scoped_ptr

chrome/browser/chromeos/extensions/echo_private_api.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/extensions/echo_private_api.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/files/file_util.h"
@@ skipping 79 matching lines @@
 EchoPrivateSetOfferInfoFunction::EchoPrivateSetOfferInfoFunction() {}
 
 EchoPrivateSetOfferInfoFunction::~EchoPrivateSetOfferInfoFunction() {}
 
 bool EchoPrivateSetOfferInfoFunction::RunSync() {
   scoped_ptr<echo_api::SetOfferInfo::Params> params =
       echo_api::SetOfferInfo::Params::Create(*args_);
   EXTENSION_FUNCTION_VALIDATE(params);
 
   const std::string& service_id = params->id;
-  base::DictionaryValue* dict = params->offer_info.
-      additional_properties.DeepCopyWithoutEmptyChildren();
+  scoped_ptr<base::DictionaryValue> dict =
+      params->offer_info.additional_properties.DeepCopyWithoutEmptyChildren();
 
   PrefService* local_state = g_browser_process->local_state();
   DictionaryPrefUpdate offer_update(local_state, prefs::kEchoCheckedOffers);
-  offer_update->SetWithoutPathExpansion("echo." + service_id, dict);
+  offer_update->SetWithoutPathExpansion("echo." + service_id, dict.Pass());
   return true;
 }
 
 EchoPrivateGetOfferInfoFunction::EchoPrivateGetOfferInfoFunction() {}
 
 EchoPrivateGetOfferInfoFunction::~EchoPrivateGetOfferInfoFunction() {}
 
 bool EchoPrivateGetOfferInfoFunction::RunSync() {
   scoped_ptr<echo_api::GetOfferInfo::Params> params =
       echo_api::GetOfferInfo::Params::Create(*args_);
@@ skipping 154 matching lines @@
 void EchoPrivateGetUserConsentFunction::Finalize(bool consent) {
   // Consent should not be true if offers redeeming is disabled.
   CHECK(redeem_offers_allowed_ || !consent);
   results_ = echo_api::GetUserConsent::Results::Create(consent);
   SendResponse(true);
 
   // Release the reference added in |OnRedeemOffersAllowedChecked|, before
   // showing the dialog.
   Release();
 }