| 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(
|
|
|