Upstream certificate and mime Android implementation.

net/base/platform_mime_util_linux.cc

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 8892668562c26e00310100c76a2d7af9b27622d4..19b315c7c3ec09f58ca0b0eb4899b7b4ebfbe0d1 100644
--- a/net/base/platform_mime_util_linux.cc
+++ b/net/base/platform_mime_util_linux.cc
@@ -6,10 +6,25 @@
 
 #include <string>
 
+#include "build/build_config.h"
+
+#if defined(OS_ANDROID)
+#include "net/android/network_library.h"
+#else
 #include "base/mime_util.h"
+#endif
 
 namespace net {
 
+#if defined(OS_ANDROID)
+
+bool PlatformMimeUtil::GetPlatformMimeTypeFromExtension(
+    const FilePath::StringType& ext, std::string* result) const {
+  return android::GetMimeTypeFromExtension(ext, result);
+}
+
+#else
+
 bool PlatformMimeUtil::GetPlatformMimeTypeFromExtension(
     const FilePath::StringType& ext, std::string* result) const {
   // TODO(thestig) This is a temporary hack until we can fix this
@@ -39,6 +54,8 @@ bool PlatformMimeUtil::GetPlatformMimeTypeFromExtension(
   return true;
 }
 
+#endif  // defined(OS_ANDROID)
+
 struct MimeToExt {
   const char* mime_type;
   const char* ext;