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

chrome_frame/chrome_frame_automation.cc

 // Copyright (c) 2009 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.
 
 #include "chrome_frame/chrome_frame_automation.h"
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/file_util.h"
 #include "base/file_version_info.h"
@@ skipping 735 matching lines @@
 
   PostTask(FROM_HERE, NewRunnableMethod(this,
       &ChromeFrameAutomationClient::InitializeComplete, launch_result));
 }
 
 void ChromeFrameAutomationClient::SetEnableExtensionAutomation(
     const std::vector<std::string>& functions_enabled) {
   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.
 void ChromeFrameAutomationClient::LaunchComplete(
     ChromeFrameAutomationProxy* proxy,
     AutomationLaunchResult result) {
   // If we're shutting down we don't keep a pointer to the automation server.
   if (init_state_ != UNINITIALIZING) {
     DCHECK(init_state_ == INITIALIZING);
     automation_server_ = proxy;
@@ skipping 339 matching lines @@
   if (font_size < SMALLEST_FONT ||
       font_size > LARGEST_FONT) {
       NOTREACHED() << "Invalid font size specified : "
                    << font_size;
       return;
   }
 
   Send(new AutomationMsg_SetPageFontSize(0, tab_handle_, font_size));
 }