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

Unified Diff: chrome/browser/automation/testing_automation_provider.cc

Issue 6623071: Fix AutomationProvider from logging false errors by replacing the persistent (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: little fix Created 9 years, 9 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/browser/automation/automation_provider_observers.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/automation/testing_automation_provider.cc
diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc
index e36d655199dae216bf32dda9ae976ba35daef9a8..128dfd67c421e45a346eefc5c4cbbb0a01d89dae 100644
--- a/chrome/browser/automation/testing_automation_provider.cc
+++ b/chrome/browser/automation/testing_automation_provider.cc
@@ -1256,9 +1256,7 @@ void TestingAutomationProvider::ExecuteJavascript(
"window.domAutomationController.setAutomationId(%d);",
reply_message->routing_id());
- DCHECK(!reply_message_);
- reply_message_ = reply_message;
-
+ new DomOperationMessageSender(this, reply_message, false);
tab_contents->render_view_host()->ExecuteJavascriptInWebFrame(
WideToUTF16Hack(frame_xpath), UTF8ToUTF16(set_automation_id));
tab_contents->render_view_host()->ExecuteJavascriptInWebFrame(
@@ -4921,7 +4919,7 @@ void TestingAutomationProvider::ExecuteJavascriptJSON(
"window.domAutomationController.setAutomationId(%d);",
reply_message->routing_id());
- new ExecuteJavascriptObserver(this, reply_message);
+ new DomOperationMessageSender(this, reply_message, true);
tab_contents->render_view_host()->ExecuteJavascriptInWebFrame(
frame_xpath, UTF8ToUTF16(set_automation_id));
tab_contents->render_view_host()->ExecuteJavascriptInWebFrame(
« no previous file with comments | « chrome/browser/automation/automation_provider_observers.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698