Move function for classifying a string as a mime type into MimeUtil

chrome/browser/intents/web_intents_registry.cc

 // Copyright (c) 2012 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 "chrome/browser/intents/web_intents_registry.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 23 matching lines @@
   if (net::MatchesMimeType(UTF16ToUTF8(type1), UTF16ToUTF8(type2)))
     return true;
   return net::MatchesMimeType(UTF16ToUTF8(type2), UTF16ToUTF8(type1));
 }
 
 // Returns true if the passed string is a MIME type. Works by comparing string
 // prefix to the valid MIME top-level types (and the wildcard type */).
 // "*" is also accepted as a valid MIME type.
 // The passed |type_str| should have no leading or trailing whitespace.
 bool IsMimeType(const string16& type_str) {
-  // MIME types are always ASCII and case-insensitive (at least, the top-level
-  // and secondary types we care about).
-  if (!IsStringASCII(type_str))
-    return false;
-  std::string raw_type = UTF16ToASCII(type_str);
-  StringToLowerASCII(&raw_type);
-
-  // See http://www.iana.org/assignments/media-types/index.html
-  if (StartsWithASCII(raw_type, "application/", false) ||
-      StartsWithASCII(raw_type, "audio/", false) ||
-      StartsWithASCII(raw_type, "example/", false) ||
-      StartsWithASCII(raw_type, "image/", false) ||
-      StartsWithASCII(raw_type, "message/", false) ||
-      StartsWithASCII(raw_type, "model/", false) ||
-      StartsWithASCII(raw_type, "multipart/", false) ||
-      StartsWithASCII(raw_type, "text/", false) ||
-      StartsWithASCII(raw_type, "video/", false) ||
-      raw_type == "*/*" || raw_type == "*") {
-    return true;
-  }
-
-  // If there's a "/" separator character, and the token before it is
-  // "x-" + (ascii characters), it is also a MIME type.
-  size_t slash = raw_type.find('/');
-  if (slash < 3 || slash == std::string::npos || slash == raw_type.length() - 1)
-    return false;
-
-  if (StartsWithASCII(raw_type, "x-", false))
-    return true;
-
-  return false;
+  return net::MatchesMimeType(UTF16ToUTF8(type_str));

[rvargas (doing something else), 2012/06/01 01:51:14]

IsStringMimeType?

 }
 
 // Compares two web intents type specifiers to see if there is a match.
 // First checks if both are MIME types. If so, uses MatchesMimeType.
 // If not, uses exact string equality.
 bool WebIntentsTypesMatch(const string16& type1, const string16& type2) {
   if (IsMimeType(type1) && IsMimeType(type2))
     return MimeTypesAreEqual(type1, type2);
 
   return type1 == type2;
@@ skipping 364 matching lines @@
       if (write_iter != read_iter)
         *write_iter = *read_iter;
     }
     ++read_iter;
   }
 
   // Cut off everything after the last intent copied to the list.
   if (++write_iter != services->end())
     services->erase(write_iter, services->end());
 }