Fixed bug where the ExecuteJavascript() family of PyAuto hooks ignored the automation id of message…

chrome/browser/automation/automation_provider_observers.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_AUTOMATION_AUTOMATION_PROVIDER_OBSERVERS_H_
 #define CHROME_BROWSER_AUTOMATION_AUTOMATION_PROVIDER_OBSERVERS_H_
 #pragma once
 
 #include <deque>
 #include <map>
@@ skipping 590 matching lines @@
   int active_match_ordinal_;
   // Send reply using json automation interface.
   bool reply_with_json_;
   scoped_ptr<IPC::Message> reply_message_;
 
   DISALLOW_COPY_AND_ASSIGN(FindInPageNotificationObserver);
 };
 
 class DomOperationObserver : public content::NotificationObserver {
  public:
-  DomOperationObserver();
+  explicit DomOperationObserver(int automation_id);
   virtual ~DomOperationObserver();
 
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
   virtual void OnDomOperationCompleted(const std::string& json) = 0;
   virtual void OnModalDialogShown() = 0;
   virtual void OnJavascriptBlocked() = 0;
 
  private:
+  int automation_id_;
   content::NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(DomOperationObserver);
 };
 
 // Sends a message back to the automation client with the results of the DOM
 // operation.
 class DomOperationMessageSender : public DomOperationObserver {
  public:
   DomOperationMessageSender(AutomationProvider* automation,
-                            IPC::Message* relpy_message,
+                            IPC::Message* reply_message,
                             bool use_json_interface);
   virtual ~DomOperationMessageSender();
 
   virtual void OnDomOperationCompleted(const std::string& json) OVERRIDE;
   virtual void OnModalDialogShown() OVERRIDE;
   virtual void OnJavascriptBlocked() OVERRIDE;
 
  private:
   base::WeakPtr<AutomationProvider> automation_;
   scoped_ptr<IPC::Message> reply_message_;
@@ skipping 1243 matching lines @@
  private:
   base::WeakPtr<AutomationProvider> automation_;
   scoped_ptr<IPC::Message> reply_message_;
   std::string extension_id_;
   content::NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionPopupObserver);
 };
 
 #endif  // CHROME_BROWSER_AUTOMATION_AUTOMATION_PROVIDER_OBSERVERS_H_