Make element removal methods in DictionaryValue and ListValue take scoped_ptr's as outparams.

chrome/browser/drive/fake_drive_service.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/drive/fake_drive_service.h"
 
 #include <string>
 
 #include "base/file_util.h"
 #include "base/logging.h"
@@ skipping 165 matching lines @@
 
 FakeDriveService::~FakeDriveService() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 }
 
 bool FakeDriveService::LoadResourceListForWapi(
     const std::string& relative_path) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   scoped_ptr<Value> raw_value = test_util::LoadJSONFile(relative_path);
   base::DictionaryValue* as_dict = NULL;
-  base::Value* feed = NULL;
+  scoped_ptr<base::Value> feed;
   base::DictionaryValue* feed_as_dict = NULL;
 
   // Extract the "feed" from the raw value and take the ownership.
   // Note that Remove() transfers the ownership to |feed|.
   if (raw_value->GetAsDictionary(&as_dict) &&
       as_dict->Remove("feed", &feed) &&
       feed->GetAsDictionary(&feed_as_dict)) {
+    ignore_result(feed.release());
     resource_list_value_.reset(feed_as_dict);
 
     // Go through entries and convert test$data from a string to a binary blob.
     base::ListValue* entries = NULL;
     if (feed_as_dict->GetList("entry", &entries)) {
       for (size_t i = 0; i < entries->GetSize(); ++i) {
         base::DictionaryValue* entry = NULL;
         std::string content_data;
         if (entries->GetDictionary(i, &entry) &&
             entry->GetString("test$data", &content_data)) {
-          entry->Set("test$data", base::BinaryValue::CreateWithCopiedBuffer(
-                  content_data.c_str(), content_data.size()));
+          entry->Set("test$data",
+                     base::BinaryValue::CreateWithCopiedBuffer(
+                         content_data.c_str(), content_data.size()));
         }
       }
     }
   }
 
   return resource_list_value_;
 }
 
 bool FakeDriveService::LoadAccountMetadataForWapi(
     const std::string& relative_path) {
@@ skipping 1330 matching lines @@
       FROM_HERE,
       base::Bind(callback, HTTP_SUCCESS, base::Passed(&resource_list)));
 }
 
 GURL FakeDriveService::GetNewUploadSessionUrl() {
   return GURL("https://upload_session_url/" +
               base::Int64ToString(next_upload_sequence_number_++));
 }
 
 }  // namespace drive