Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable.

net/base/mime_util.h

 // 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.
 
 #ifndef NET_BASE_MIME_UTIL_H__
 #define NET_BASE_MIME_UTIL_H__
 
 #include <string>
 #include <vector>
 
 #include "base/file_path.h"
 #include "net/base/net_export.h"
 
 namespace net {
 
 // Get the mime type (if any) that is associated with the given file extension.
 // Returns true if a corresponding mime type exists.
-NET_EXPORT bool GetMimeTypeFromExtension(const FilePath::StringType& ext,
+NET_EXPORT bool GetMimeTypeFromExtension(const base::FilePath::StringType& ext,

[Mattias Nissler (ping if slow), 2013/02/06 17:53:33]

unrelated changes?

[Jói, 2013/02/07 14:52:32]

Correct, as in pref_member.h. Removed.

                                          std::string* mime_type);
 
 // Get the mime type (if any) that is associated with the given file extension.
 // Returns true if a corresponding mime type exists. In this method,
 // the search for a mime type is constrained to a limited set of
 // types known to the net library, the OS/registry is not consulted.
 NET_EXPORT bool GetWellKnownMimeTypeFromExtension(
-    const FilePath::StringType& ext,
+    const base::FilePath::StringType& ext,
     std::string* mime_type);
 
 // Get the mime type (if any) that is associated with the given file.  Returns
 // true if a corresponding mime type exists.
 NET_EXPORT bool GetMimeTypeFromFile(const FilePath& file_path,
                                     std::string* mime_type);
 
 // Get the preferred extension (if any) associated with the given mime type.
 // Returns true if a corresponding file extension exists.  The extension is
 // returned without a prefixed dot, ex "html".
 NET_EXPORT bool GetPreferredExtensionForMimeType(
     const std::string& mime_type,
-    FilePath::StringType* extension);
+    base::FilePath::StringType* extension);
 
 // Check to see if a particular MIME type is in our list.
 NET_EXPORT bool IsSupportedImageMimeType(const std::string& mime_type);
 NET_EXPORT bool IsSupportedMediaMimeType(const std::string& mime_type);
 NET_EXPORT bool IsSupportedNonImageMimeType(const std::string& mime_type);
 NET_EXPORT bool IsUnsupportedTextMimeType(const std::string& mime_type);
 NET_EXPORT bool IsSupportedJavascriptMimeType(const std::string& mime_type);
 NET_EXPORT bool IsSupportedCertificateMimeType(const std::string& mime_type);
 
 // Convenience function.
@@ skipping 35 matching lines @@
     const std::string& mime_type,
     const std::vector<std::string>& codecs);
 
 // Get the extensions associated with the given mime type. This should be passed
 // in lower case. There could be multiple extensions for a given mime type, like
 // "html,htm" for "text/html", or "txt,text,html,..." for "text/*".
 // Note that we do not erase the existing elements in the the provided vector.
 // Instead, we append the result to it.
 NET_EXPORT void GetExtensionsForMimeType(
     const std::string& mime_type,
-    std::vector<FilePath::StringType>* extensions);
+    std::vector<base::FilePath::StringType>* extensions);
 
 // Test only methods that return lists of proprietary media types and codecs
 // that are not supported by all variations of Chromium.
 // These types and codecs must be blacklisted to ensure consistent layout test
 // results across all Chromium variations.
 NET_EXPORT void GetMediaTypesBlacklistedForTests(
     std::vector<std::string>* types);
 NET_EXPORT void GetMediaCodecsBlacklistedForTests(
     std::vector<std::string>* codecs);
 
 // Returns the IANA media type contained in |mime_type|, or an empty
 // string if |mime_type| does not specifify a known media type.
 // Supported media types are defined at:
 // http://www.iana.org/assignments/media-types/index.html
 NET_EXPORT const std::string GetIANAMediaType(const std::string& mime_type);
 
 // A list of supported certificate-related mime types.
 enum CertificateMimeType {
 #define CERTIFICATE_MIME_TYPE(name, value) CERTIFICATE_MIME_TYPE_ ## name = value,
 #include "net/base/mime_util_certificate_type_list.h"
 #undef CERTIFICATE_MIME_TYPE
 };
 
 NET_EXPORT CertificateMimeType GetCertificateMimeTypeForMimeType(
     const std::string& mime_type);
 
 }  // namespace net
 
 #endif  // NET_BASE_MIME_UTIL_H__