Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(11146)

Unified Diff: chrome/test/automation/automation_json_requests.h

Issue 21030009: Make element removal methods in DictionaryValue and ListValue take scoped_ptr's as outparams. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sync Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/common/extensions/api/extension_api.cc ('k') | chrome/test/automation/automation_json_requests.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/automation/automation_json_requests.h
diff --git a/chrome/test/automation/automation_json_requests.h b/chrome/test/automation/automation_json_requests.h
index 6f931050ffac7575a62539ec3ee818df139e45c7..6f8a5f3c68201720889739048970c2e46ebffb3a 100644
--- a/chrome/test/automation/automation_json_requests.h
+++ b/chrome/test/automation/automation_json_requests.h
@@ -10,6 +10,7 @@
#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"
@@ -207,14 +208,14 @@ bool SendNavigateToURLJSONRequest(
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.
@@ -265,7 +266,7 @@ bool SendHeapProfilerDumpJSONRequestDeprecated(
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
« no previous file with comments | « chrome/common/extensions/api/extension_api.cc ('k') | chrome/test/automation/automation_json_requests.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698