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

Unified Diff: chrome/test/webdriver/webdriver_automation.cc

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/test/webdriver/webdriver_automation.h ('k') | chrome/test/webdriver/webdriver_session.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/webdriver/webdriver_automation.cc
diff --git a/chrome/test/webdriver/webdriver_automation.cc b/chrome/test/webdriver/webdriver_automation.cc
index 7ecff746128a8992e952b6d0b4fe748368eb07f7..58d212b25dc9dd0f4680136818ff0e0603f6d0ab 100644
--- a/chrome/test/webdriver/webdriver_automation.cc
+++ b/chrome/test/webdriver/webdriver_automation.cc
@@ -544,15 +544,14 @@ void Automation::ExecuteScript(const WebViewId& view_id,
if (*error)
return;
- Value* unscoped_value;
automation::Error auto_error;
+ scoped_ptr<Value> value;
if (!SendExecuteJavascriptJSONRequest(automation(), view_locator,
frame_path.value(), script,
- &unscoped_value, &auto_error)) {
+ &value, &auto_error)) {
*error = Error::FromAutomationError(auto_error);
return;
}
- scoped_ptr<Value> value(unscoped_value);
if (!value->GetAsString(result))
*error = new Error(kUnknownError, "Execute script did not return string");
}
@@ -844,7 +843,7 @@ void Automation::Reload(const WebViewId& view_id, Error** error) {
}
void Automation::GetCookies(const std::string& url,
- ListValue** cookies,
+ scoped_ptr<ListValue>* cookies,
Error** error) {
automation::Error auto_error;
if (!SendGetCookiesJSONRequest(automation(), url, cookies, &auto_error))
« no previous file with comments | « chrome/test/webdriver/webdriver_automation.h ('k') | chrome/test/webdriver/webdriver_session.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698