2 files changed, 7 insertions, 8 deletions
diff --git a/chrome_frame/chrome_frame_automation.cc b/chrome_frame/chrome_frame_automation.cc
index 6b9acb8..54e114d 100644
--- a/chrome_frame/chrome_frame_automation.cc
+++ b/chrome_frame/chrome_frame_automation.cc
@@ -755,7 +755,13 @@ void ChromeFrameAutomationClient::SetEnableExtensionAutomation(
   if (!is_initialized())
     return;
 
-  automation_server_->SetEnableExtensionAutomation(functions_enabled);
+  // We are doing initialization, so there is no need to reset extension
+  // automation, only to set it.  Also, we want to avoid resetting extension
+  // automation that some other automation client has set up.  Therefore only
+  // send the message if we are going to enable automation of some functions.
+  if (functions_enabled.size() > 0) {
+    tab_->SetEnableExtensionAutomation(functions_enabled);
+  }
 }
 
 // Invoked in launch background thread.
diff --git a/chrome_frame/chrome_frame_automation.h b/chrome_frame/chrome_frame_automation.h
index 9d948a3..8def0fd 100644
--- a/chrome_frame/chrome_frame_automation.h
+++ b/chrome_frame/chrome_frame_automation.h
@@ -41,8 +41,6 @@ struct DECLSPEC_NOVTABLE ChromeFrameAutomationProxy {
   virtual std::string server_version() = 0;
 
   virtual void SendProxyConfig(const std::string&) = 0;
-  virtual void SetEnableExtensionAutomation(
-      const std::vector<std::string>& functions_enabled) = 0;
  protected:
   ~ChromeFrameAutomationProxy() {}
 };
@@ -73,11 +71,6 @@ class ChromeFrameAutomationProxyImpl : public ChromeFrameAutomationProxy,
     AutomationProxy::SendProxyConfig(p);
   }
 
-  virtual void SetEnableExtensionAutomation(
-      const std::vector<std::string>& functions_enabled) {
-    AutomationProxy::SetEnableExtensionAutomation(functions_enabled);
-  }
-
  protected:
   explicit ChromeFrameAutomationProxyImpl(int launch_timeout);
   ~ChromeFrameAutomationProxyImpl();