Upstream certificate and mime Android implementation.

net/base/platform_mime_util_linux.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/base/platform_mime_util.h"
 
 #include <string>
 
+#if defined(OS_ANDROID)
+#include "net/android/network_library.h"
+#else
 #include "base/mime_util.h"
+#endif

[wtc, 2011/08/09 18:47:22]

This should be done as follows:

#include "base/mime_util.h"
#include "build/build_config.h"

#if defined(OS_ANDROID)
#include "net/android/network_library.h"
#endif

See http://www.chromium.org/developers/coding-style#TOC-Platform-specific-code

Is it OK to include "base/mime_util.h" on Android?
If necessary, you can do it like this:

#include "build/build_config.h"

#if defined(OS_ANDROID)
#include "net/android/network_library.h"
#else
#include "base/mime_util.h"
#endif

[michaelbai, 2011/08/11 16:10:18]

Done.

 
 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
   // 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 dummy_path("foo." + ext);
   std::string out = mime_util::GetFileMimeType(dummy_path);
 
   // GetFileMimeType likes to return application/octet-stream
   // for everything it doesn't know - ignore that.
   if (out == "application/octet-stream" || out.empty())
     return false;
 
   // GetFileMimeType returns image/x-ico because that's what's in the XDG
   // mime database. That database is the merger of the Gnome and KDE mime
   // databases. Apparently someone working on KDE in 2001 decided .ico
   // resolves to image/x-ico, whereas the rest of the world uses image/x-icon.
   // FWIW, image/vnd.microsoft.icon is the official IANA assignment.
   if (out == "image/x-ico")
     out = "image/x-icon";
 
   *result = out;
   return true;
 }
 
+#endif

[wtc, 2011/08/09 18:47:22]

Add a
  // defined(OS_ANDROID)
comment.

[michaelbai, 2011/08/11 16:10:18]

Done.

+
 struct MimeToExt {
   const char* mime_type;
   const char* ext;
 };
 
 const struct MimeToExt mime_type_ext_map[] = {
   {"application/pdf", "pdf"},
   {"application/x-tar", "tar"},
   {"audio/mpeg", "mp3"},
   {"image/gif", "gif"},
@@ skipping 25 matching lines @@
   //
   // If we wanted to do this properly, we would read the mime.cache file which
   // has a section where they assign a glob (*.gif) to a mimetype
   // (image/gif). We look up the "heaviest" glob for a certain mime type and
   // then then try to chop off "*.".
 
   return false;
 }
 
 }  // namespace net