Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(983)

Unified Diff: net/base/platform_mime_util_linux.cc

Issue 8429034: Upstream: Build net_unittests for Android. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: split out unreviewed files Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/base/net_util_unittest.cc ('k') | net/base/x509_certificate_openssl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/base/platform_mime_util_linux.cc
diff --git a/net/base/platform_mime_util_linux.cc b/net/base/platform_mime_util_linux.cc
index 5aba0e35c5514d9dbb46016ddfc772286e3d0f1a..564dc311e37e306ace7e9fffe9d10f4ba668983e 100644
--- a/net/base/platform_mime_util_linux.cc
+++ b/net/base/platform_mime_util_linux.cc
@@ -20,12 +20,18 @@ namespace net {
#if defined(OS_ANDROID)
bool PlatformMimeUtil::GetPlatformMimeTypeFromExtension(
const FilePath::StringType& ext, std::string* result) const {
+ // TODO(jingzhao): Recover the original implementation once we support JNI.
+#if 0
return android::GetMimeTypeFromExtension(ext, result);
+#else
+ NOTIMPLEMENTED();
+ return false;
+#endif
}
#else
bool PlatformMimeUtil::GetPlatformMimeTypeFromExtension(
const FilePath::StringType& ext, std::string* result) const {
- // TODO(thestig) This is a temporary hack until we can fix this
+ // 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.
« no previous file with comments | « net/base/net_util_unittest.cc ('k') | net/base/x509_certificate_openssl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698