Revert change 13558 and 13555 because they broke the plugin

tests and the test_shell_tests on linux.

PLEASE back yourself out when you see you can't fix
a bug instead of leaving it red for days.

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

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

2 files changed, 0 insertions, 17 deletions

diff --git a/webkit/activex_shim/activex_shared.cc b/webkit/activex_shim/activex_shared.cc
index 649ce01..c5b06a5 100644
--- a/webkit/activex_shim/activex_shared.cc
+++ b/webkit/activex_shim/activex_shared.cc
@@ -225,17 +225,4 @@ bool IsMimeTypeActiveX(const std::string& mimetype) {
          LowerCaseEqualsASCII(mimetype, "application/oleobject");
 }
 
-bool GetMimeTypeForClsid(const std::string& clsid, std::string* mime_type) {
-  DCHECK(mime_type != NULL);
-
-  if (!base::strcasecmp(clsid.c_str(),
-                        "6BF52A52-394A-11D3-B153-00C04F79FAA6") ||
-      !base::strcasecmp(clsid.c_str(),
-                        "22D6F312-B0F6-11D0-94AB-0080C74C7E95")) {
-    *mime_type = "application/x-mplayer2";
-    return true;
-  }
-  return false;
-}
-
 }  // namespace activex_shim
diff --git a/webkit/activex_shim/activex_shared.h b/webkit/activex_shim/activex_shared.h
index 062dd8d..9b34dc9 100644
--- a/webkit/activex_shim/activex_shared.h
+++ b/webkit/activex_shim/activex_shared.h
@@ -61,10 +61,6 @@ bool IsCodebaseAllowed(const std::string& clsid, const std::string& codebase);
 // "application/oleobject"
 bool IsMimeTypeActiveX(const std::string& mimetype);
 
-// Returns the NPAPI mime type for the CLSID passed in. On failure
-// return false
-bool GetMimeTypeForClsid(const std::string& clsid, std::string* mime_type);
-
 }  // namespace activex_shim
 
 #endif // #ifndef WEBKIT_ACTIVEX_SHIM_ACTIVEX_SHARED_H__