summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-16 08:21:40 +0000
committerthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-16 08:21:40 +0000
commitedd41c5c3443318af2c793458c985c2118d188d8 (patch)
treeae2293d9204ae2d903ca6bb009311ae9e444df56 /net
parent76688089aca3fd527d2d4ca3c81170f7e532c811 (diff)
downloadchromium_src-edd41c5c3443318af2c793458c985c2118d188d8.zip
chromium_src-edd41c5c3443318af2c793458c985c2118d188d8.tar.gz
chromium_src-edd41c5c3443318af2c793458c985c2118d188d8.tar.bz2
Add a temporary hack to not resolve the mime type for .pl files to fix a layout test.
Remove a NOTIMPLEMENTED that was breaking layout tests. TBR=estade Review URL: http://codereview.chromium.org/113500 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16233 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rw-r--r--net/base/platform_mime_util_linux.cc9
1 files changed, 7 insertions, 2 deletions
diff --git a/net/base/platform_mime_util_linux.cc b/net/base/platform_mime_util_linux.cc
index 2afdc47..105048d 100644
--- a/net/base/platform_mime_util_linux.cc
+++ b/net/base/platform_mime_util_linux.cc
@@ -4,7 +4,6 @@
#include <string>
-#include "base/logging.h"
#include "base/mime_util.h"
#include "net/base/platform_mime_util.h"
@@ -12,6 +11,13 @@ namespace net {
bool PlatformMimeUtil::GetPlatformMimeTypeFromExtension(
const FilePath::StringType& ext, std::string* result) const {
+ // TODO(thestig) This is a temporary hack until we can fix this
+ // properly in test shell / webkit.
+ // We have to play dumb and not return application/x-perl here
+ // to make the reload-subframe-object layout test happy.
+ if (ext == "pl")
+ return false;
+
FilePath::StringType dummy_path = "foo." + ext;
std::string out = mime_util::GetFileMimeType(dummy_path);
@@ -43,7 +49,6 @@ bool PlatformMimeUtil::GetPreferredExtensionForMimeType(
// (image/gif). We look up the "heaviest" glob for a certain mime type and
// then then try to chop off "*.".
- NOTIMPLEMENTED();
return false;
}