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

chrome/test/automation/automation_json_requests.h

 // 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.
 
 #ifndef CHROME_TEST_AUTOMATION_AUTOMATION_JSON_REQUESTS_H_
 #define CHROME_TEST_AUTOMATION_AUTOMATION_JSON_REQUESTS_H_
 
 #include <string>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/strings/string_number_conversions.h"
 #include "chrome/common/automation_constants.h"
 #include "chrome/common/automation_id.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 
 class AutomationMessageSender;
 
 namespace base {
 class DictionaryValue;
 class FilePath;
@@ skipping 177 matching lines @@
 // navigations to complete. Returns true on success.
 bool SendNavigateToURLJSONRequest(
     AutomationMessageSender* sender,
     const WebViewLocator& locator,
     const std::string& url,
     int navigation_count,
     AutomationMsg_NavigationResponseValues* nav_response,
     automation::Error* error) WARN_UNUSED_RESULT;
 
 // Requests the given javascript to be executed in the frame specified by the
-// given xpath. Returns true on success. If true, |result| will be set to the
-// result of the execution and ownership will be given to the caller.
+// given xpath. Returns true on success. If true, |result| will be reset to the
+// result of the execution.
 bool SendExecuteJavascriptJSONRequest(
     AutomationMessageSender* sender,
     const WebViewLocator& locator,
     const std::string& frame_xpath,
     const std::string& javascript,
-    base::Value** result,
+    scoped_ptr<base::Value>* result,
     automation::Error* error) WARN_UNUSED_RESULT;
 
 // Requests the specified view to go forward. Waits for the load to complete.
 // Returns true on success.
 bool SendGoForwardJSONRequest(
     AutomationMessageSender* sender,
     const WebViewLocator& locator,
     automation::Error* error) WARN_UNUSED_RESULT;
 
 // Requests the specified view to go back. Waits for the load to complete.
@@ skipping 30 matching lines @@
     const std::string& reason,
     automation::Error* error) WARN_UNUSED_RESULT;
 #endif  // !defined(NO_TCMALLOC) && (defined(OS_LINUX) || defined(OS_CHROMEOS))
 
 // Requests all the cookies for the given URL. On success returns true and
 // caller takes ownership of |cookies|, which is a list of all the cookies in
 // dictionary format.
 bool SendGetCookiesJSONRequest(
     AutomationMessageSender* sender,
     const std::string& url,
-    base::ListValue** cookies,
+    scoped_ptr<base::ListValue>* cookies,
     automation::Error* error) WARN_UNUSED_RESULT;
 
 // Requests deletion of the cookie with the given name and URL. Returns true
 // on success.
 bool SendDeleteCookieJSONRequest(
     AutomationMessageSender* sender,
     const std::string& url,
     const std::string& cookie_name,
     automation::Error* error) WARN_UNUSED_RESULT;
 
@@ skipping 250 matching lines @@
     base::Value* value,
     automation::Error* error) WARN_UNUSED_RESULT;
 
 // Requests to override the user's geolocation. Returns true on success.
 bool SendOverrideGeolocationJSONRequest(
     AutomationMessageSender* sender,
     const base::DictionaryValue* geolocation,
     automation::Error* error) WARN_UNUSED_RESULT;
 
 #endif  // CHROME_TEST_AUTOMATION_AUTOMATION_JSON_REQUESTS_H_