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

Issues Search
    My Issues | Starred     Open | Closed | All

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: Created 9 years, 2 months 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
« crypto/crypto.gyp ('K') | « net/base/net_util_unittest.cc ('k') | net/base/x509_certificate_openssl.cc » ('j') | net/base/x509_certificate_openssl.cc » ('J')
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 c841914dde778d9ac6850620f3e910382ac1d7f7..e0ff7c2f22962c4226f8411d110807f3d6ba654c 100644
--- a/net/base/platform_mime_util_linux.cc
+++ b/net/base/platform_mime_util_linux.cc
@@ -20,7 +20,9 @@ namespace net {
#if defined(OS_ANDROID)
bool PlatformMimeUtil::GetPlatformMimeTypeFromExtension(
const FilePath::StringType& ext, std::string* result) const {
- return android::GetMimeTypeFromExtension(ext, result);
+ // TODO(jingzhao): Replace "false" with
+ // "android::GetMimeTypeFromExtension(ext, result)" once we support JNI.
John Grabowski 2011/11/01 23:09:34 Please start spreadsheet docing these "once we hav
Jing Zhao 2011/11/02 16:22:55 Done.
+ return false;
}
#elif defined(USE_AURA)
bool PlatformMimeUtil::GetPlatformMimeTypeFromExtension(
@@ -31,7 +33,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.
« crypto/crypto.gyp ('K') | « net/base/net_util_unittest.cc ('k') | net/base/x509_certificate_openssl.cc » ('j') | net/base/x509_certificate_openssl.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698