diff options
author | limasdf@gmail.com <limasdf@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-23 04:36:44 +0000 |
---|---|---|
committer | limasdf@gmail.com <limasdf@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-23 04:36:44 +0000 |
commit | a413c718f6fecb536216efd33182db6ec3ca3a63 (patch) | |
tree | ebfe871e8c039908f2237e3f5db2d4e0f73d0a1d /net/base/mime_util.cc | |
parent | 0ced03f51bb47c2d3f36a5077cff8923e1543079 (diff) | |
download | chromium_src-a413c718f6fecb536216efd33182db6ec3ca3a63.zip chromium_src-a413c718f6fecb536216efd33182db6ec3ca3a63.tar.gz chromium_src-a413c718f6fecb536216efd33182db6ec3ca3a63.tar.bz2 |
[CleanUp] Use base::STLSetDifference() in place of std::set_difference()
BUG=254066
TEST=net_unittests
Review URL: https://chromiumcodereview.appspot.com/24155002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@224658 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base/mime_util.cc')
-rw-r--r-- | net/base/mime_util.cc | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/net/base/mime_util.cc b/net/base/mime_util.cc index d0ab79c..70dd353 100644 --- a/net/base/mime_util.cc +++ b/net/base/mime_util.cc @@ -10,6 +10,7 @@ #include "base/containers/hash_tables.h" #include "base/lazy_instance.h" #include "base/logging.h" +#include "base/stl_util.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" @@ -222,10 +223,9 @@ bool MimeUtil::GetMimeTypeFromExtensionHelper( base::FilePath path_ext(ext); const string ext_narrow_str = path_ext.AsUTF8Unsafe(); - const char* mime_type; - - mime_type = FindMimeType(primary_mappings, arraysize(primary_mappings), - ext_narrow_str.c_str()); + const char* mime_type = FindMimeType(primary_mappings, + arraysize(primary_mappings), + ext_narrow_str.c_str()); if (mime_type) { *result = mime_type; return true; @@ -542,11 +542,9 @@ bool MatchesMimeTypeParameters(const std::string& mime_type_pattern, sort(pattern_parameters.begin(), pattern_parameters.end()); sort(test_parameters.begin(), test_parameters.end()); - std::vector<std::string> difference; - std::set_difference(pattern_parameters.begin(), pattern_parameters.end(), - test_parameters.begin(), test_parameters.end(), - std::inserter(difference, difference.begin())); - + std::vector<std::string> difference = + base::STLSetDifference<std::vector<std::string> >(pattern_parameters, + test_parameters); return difference.size() == 0; } return true; |