Modifying extension automation so that it is done through a particular...

chrome_frame/chrome_frame_automation.cc

Index: chrome_frame/chrome_frame_automation.cc
===================================================================
--- chrome_frame/chrome_frame_automation.cc	(revision 31172)
+++ chrome_frame/chrome_frame_automation.cc	(working copy)
@@ -753,7 +753,13 @@
   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.