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

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: fix a bug in ssl_client_socket_openssl.cc and address comments 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
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 c841914dde778d9ac6850620f3e910382ac1d7f7..611d3d5f4ac5c7fad6ec2a17b2fb32a1c58a493a 100644
--- a/net/base/platform_mime_util_linux.cc
+++ b/net/base/platform_mime_util_linux.cc
@@ -20,7 +20,13 @@ 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
}
#elif defined(USE_AURA)
bool PlatformMimeUtil::GetPlatformMimeTypeFromExtension(
@@ -31,7 +37,7 @@ bool PlatformMimeUtil::GetPlatformMimeTypeFromExtension(
#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.

Powered by Google App Engine
This is Rietveld 408576698