Take out the activex control.BUG=20259

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

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

3 files changed, 3 insertions, 13 deletions

diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index 95e29e2..90cd98f 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -102,7 +102,7 @@ const wchar_t kDisableAltWinstation[]         = L"disable-winsta";
 const wchar_t kSafePlugins[]                   = L"safe-plugins";
 
 // Excludes these plugins from the plugin sandbox.
-// This is a comma-separated list of plugin library names and activex clsid.
+// This is a comma-separated list of plugin library names.
 const wchar_t kTrustedPlugins[]                = L"trusted-plugins";
 
 // Runs the security test for the sandbox.
@@ -266,12 +266,6 @@ const wchar_t kDebugPrint[]                    = L"debug-print";
 // Prints the pages on the screen.
 const wchar_t kPrint[] = L"print";
 
-// Allow initialization of all activex controls. This is only to help website
-// developers test their controls to see if they are compatible in Chrome.
-// Note there's a duplicate value in activex_shared.cc (to avoid
-// dependency on chrome module). Please change both locations at the same time.
-const wchar_t kAllowAllActiveX[]               = L"allow-all-activex";
-
 // Browser flag to disable the web inspector for all renderers.
 const wchar_t kDisableDevTools[]               = L"disable-dev-tools";
 
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index 59cd449..959b0b3 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -91,8 +91,6 @@ extern const wchar_t kPrint[];
 extern const wchar_t kDnsLogDetails[];
 extern const wchar_t kDnsPrefetchDisable[];
 
-extern const wchar_t kAllowAllActiveX[];
-
 extern const wchar_t kDisableDevTools[];
 extern const wchar_t kAlwaysEnableDevTools[];
 extern const wchar_t kEnableExtensionTimelineApi[];
diff --git a/chrome/common/render_messages_internal.h b/chrome/common/render_messages_internal.h
index 9e9ac815..aad21c2 100644
--- a/chrome/common/render_messages_internal.h
+++ b/chrome/common/render_messages_internal.h
@@ -924,11 +924,10 @@ IPC_BEGIN_MESSAGES(ViewHost)
 
   // Returns a path to a plugin for the given url and mime type.  If there's
   // no plugin, an empty string is returned.
-  IPC_SYNC_MESSAGE_CONTROL4_2(ViewHostMsg_GetPluginPath,
+  IPC_SYNC_MESSAGE_CONTROL3_2(ViewHostMsg_GetPluginPath,
                               GURL /* url */,
                               GURL /* policy_url */,
                               std::string /* mime_type */,
-                              std::string /* clsid */,
                               FilePath /* filename */,
                               std::string /* actual mime type for url */)
 
@@ -1020,10 +1019,9 @@ IPC_BEGIN_MESSAGES(ViewHost)
   // create a plugin.  The browser will create the plugin process if
   // necessary, and will return a handle to the channel on success.
   // On error an empty string is returned.
-  IPC_SYNC_MESSAGE_CONTROL4_2(ViewHostMsg_OpenChannelToPlugin,
+  IPC_SYNC_MESSAGE_CONTROL3_2(ViewHostMsg_OpenChannelToPlugin,
                               GURL /* url */,
                               std::string /* mime_type */,
-                              std::string /* clsid */,
                               std::wstring /* locale */,
                               IPC::ChannelHandle /* handle to channel */,
                               WebPluginInfo /* info */)