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

chrome/test/automation/automation_json_requests.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/test/automation/automation_json_requests.h"
 
 #include "base/basictypes.h"
 #include "base/files/file_path.h"
 #include "base/format_macros.h"
 #include "base/json/json_reader.h"
@@ skipping 266 matching lines @@
     return false;
   *nav_response = static_cast<AutomationMsg_NavigationResponseValues>(response);
   return true;
 }
 
 bool SendExecuteJavascriptJSONRequest(
     AutomationMessageSender* sender,
     const WebViewLocator& locator,
     const std::string& frame_xpath,
     const std::string& javascript,
-    Value** result,
+    scoped_ptr<Value>* result,
     Error* error) {
   DictionaryValue dict;
   dict.SetString("command", "ExecuteJavascript");
   locator.UpdateDictionary(&dict, "auto_id");
   dict.SetString("frame_xpath", frame_xpath);
   dict.SetString("javascript", javascript);
   DictionaryValue reply_dict;
   if (!SendAutomationJSONRequest(sender, dict, &reply_dict, error))
     return false;
 
@@ skipping 77 matching lines @@
   locator.UpdateDictionary(&dict, "auto_id");
   DictionaryValue reply_dict;
 
   return SendAutomationJSONRequest(sender, dict, &reply_dict, error);
 }
 #endif  // !defined(NO_TCMALLOC) && (defined(OS_LINUX) || defined(OS_CHROMEOS))
 
 bool SendGetCookiesJSONRequest(
     AutomationMessageSender* sender,
     const std::string& url,
-    ListValue** cookies,
+    scoped_ptr<ListValue>* cookies,
     Error* error) {
   DictionaryValue dict;
   dict.SetString("command", "GetCookies");
   dict.SetString("url", url);
   DictionaryValue reply_dict;
   if (!SendAutomationJSONRequest(sender, dict, &reply_dict, error))
     return false;
-  Value* cookies_unscoped_value;
-  if (!reply_dict.Remove("cookies", &cookies_unscoped_value))
+  scoped_ptr<Value> cookies_value;
+  if (!reply_dict.Remove("cookies", &cookies_value))
     return false;
-  scoped_ptr<Value> cookies_value(cookies_unscoped_value);
   if (!cookies_value->IsType(Value::TYPE_LIST))
     return false;
-  *cookies = static_cast<ListValue*>(cookies_value.release());
+  cookies->reset(static_cast<ListValue*>(cookies_value.release()));
   return true;
 }
 
 bool SendDeleteCookieJSONRequest(
     AutomationMessageSender* sender,
     const std::string& url,
     const std::string& cookie_name,
     Error* error) {
   DictionaryValue dict;
   dict.SetString("command", "DeleteCookie");
@@ skipping 527 matching lines @@
 
 bool SendOverrideGeolocationJSONRequest(
     AutomationMessageSender* sender,
     const base::DictionaryValue* geolocation,
     Error* error) {
   scoped_ptr<DictionaryValue> dict(geolocation->DeepCopy());
   dict->SetString("command", "OverrideGeoposition");
   DictionaryValue reply_dict;
   return SendAutomationJSONRequest(sender, *dict.get(), &reply_dict, error);
 }