Fixed bug where the ExecuteJavascript() family of PyAuto hooks ignored the automation id of messages from DomAutomationController.

This had the effect of hooks returning on the next message from
DomAutomationController regardless of whether that message actually
indicated completion of the injected javascript.

BUG=120769
TEST=functional/execute_javascript.py


Review URL: http://codereview.chromium.org/9950098

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@132503 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 3 insertions, 2 deletions

diff --git a/chrome/browser/automation/automation_provider_observers.h b/chrome/browser/automation/automation_provider_observers.h
index de14843..e1f2bda 100644
--- a/chrome/browser/automation/automation_provider_observers.h
+++ b/chrome/browser/automation/automation_provider_observers.h
@@ -608,7 +608,7 @@ class FindInPageNotificationObserver : public content::NotificationObserver {
 
 class DomOperationObserver : public content::NotificationObserver {
  public:
-  DomOperationObserver();
+  explicit DomOperationObserver(int automation_id);
   virtual ~DomOperationObserver();
 
   virtual void Observe(int type,
@@ -620,6 +620,7 @@ class DomOperationObserver : public content::NotificationObserver {
   virtual void OnJavascriptBlocked() = 0;
 
  private:
+  int automation_id_;
   content::NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(DomOperationObserver);
@@ -630,7 +631,7 @@ class DomOperationObserver : public content::NotificationObserver {
 class DomOperationMessageSender : public DomOperationObserver {
  public:
   DomOperationMessageSender(AutomationProvider* automation,
-                            IPC::Message* relpy_message,
+                            IPC::Message* reply_message,
                             bool use_json_interface);
   virtual ~DomOperationMessageSender();