Making no automation the default - this was the intent of a previous

change (not calling SetEnableExtensionAutomation on startup unless some
functions are being automated) that missed this outstanding issue.

BUG=none
TEST=none

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

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

2 files changed, 6 insertions, 4 deletions

diff --git a/chrome_frame/chrome_frame_plugin.h b/chrome_frame/chrome_frame_plugin.h
index fbc3f77..6d29948 100644
--- a/chrome_frame/chrome_frame_plugin.h
+++ b/chrome_frame/chrome_frame_plugin.h
@@ -19,7 +19,6 @@ class ChromeFramePlugin : public ChromeFrameDelegateImpl {
   ChromeFramePlugin()
       : ignore_setfocus_(false),
         is_privileged_(false) {
-    functions_enabled_.push_back("*");
   }
   ~ChromeFramePlugin() {
     Uninitialize();
@@ -210,8 +209,10 @@ END_MSG_MAP()
   // When privileged, additional interfaces are made available to the user.
   bool is_privileged_;
 
-  // List of functions to enable for automation, or a single entry "*" to enable
-  // all functions for automation.  Ignored unless is_privileged_ is true.
+  // List of functions to enable for automation, or a single entry "*" to
+  // enable all functions for automation.  Ignored unless is_privileged_ is
+  // true.  Defaults to the empty list, meaning automation will not be
+  // turned on.
   std::vector<std::string> functions_enabled_;
 };
 
diff --git a/chrome_frame/chrome_tab.idl b/chrome_frame/chrome_tab.idl
index c234c29..31f9472 100644
--- a/chrome_frame/chrome_tab.idl
+++ b/chrome_frame/chrome_tab.idl
@@ -92,7 +92,8 @@ interface IChromeFramePrivileged: IUnknown {
   // The profile name we want to use.
   HRESULT GetChromeProfileName([out] BSTR *profile_name);
   // The comma-separated list of extension API functions you wish to automate.
-  // Return S_FALSE to leave the default, which is to automate all functions.
+  // Return S_FALSE to leave the default, which is to not automate any 
+  // functions.
   HRESULT GetExtensionApisToAutomate([out] BSTR *extension_apis);
 };