summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--base/string_split.cc19
-rw-r--r--base/string_split_unittest.cc21
-rw-r--r--chrome/common/extensions/api/extension_api.cc2
-rw-r--r--chrome/common/extensions/api/extension_api_unittest.cc1
-rw-r--r--net/base/mime_util.cc71
-rw-r--r--net/base/mime_util_unittest.cc18
6 files changed, 70 insertions, 62 deletions
diff --git a/base/string_split.cc b/base/string_split.cc
index cdf708b..ea694d5 100644
--- a/base/string_split.cc
+++ b/base/string_split.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
@@ -17,19 +17,16 @@ static void SplitStringT(const STR& str,
bool trim_whitespace,
std::vector<STR>* r) {
size_t last = 0;
- size_t i;
size_t c = str.size();
- for (i = 0; i <= c; ++i) {
+ for (size_t i = 0; i <= c; ++i) {
if (i == c || str[i] == s) {
- size_t len = i - last;
- STR tmp = str.substr(last, len);
- if (trim_whitespace) {
- STR t_tmp;
- TrimWhitespace(tmp, TRIM_ALL, &t_tmp);
- r->push_back(t_tmp);
- } else {
+ STR tmp(str, last, i - last);
+ if (trim_whitespace)
+ TrimWhitespace(tmp, TRIM_ALL, &tmp);
+ // Avoid converting an empty or all-whitespace source string into a vector
+ // of one empty string.
+ if (i != c || !r->empty() || !tmp.empty())
r->push_back(tmp);
- }
last = i + 1;
}
}
diff --git a/base/string_split_unittest.cc b/base/string_split_unittest.cc
index 83e4d74..5d4dafe 100644
--- a/base/string_split_unittest.cc
+++ b/base/string_split_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
@@ -163,8 +163,7 @@ TEST(StringUtilTest, SplitString) {
std::vector<std::wstring> r;
SplitString(L"", L',', &r);
- ASSERT_EQ(1U, r.size());
- EXPECT_EQ(r[0], L"");
+ EXPECT_EQ(0U, r.size());
r.clear();
SplitString(L"a,b,c", L',', &r);
@@ -188,9 +187,8 @@ TEST(StringUtilTest, SplitString) {
EXPECT_EQ(r[2], L"c");
r.clear();
- SplitString(L"", L'*', &r);
- ASSERT_EQ(1U, r.size());
- EXPECT_EQ(r[0], L"");
+ SplitString(L" ", L'*', &r);
+ EXPECT_EQ(0U, r.size());
r.clear();
SplitString(L"foo", L'*', &r);
@@ -266,12 +264,17 @@ TEST(SplitStringUsingSubstrTest, TrailingDelimitersSkipped) {
TEST(StringSplitTest, StringSplitDontTrim) {
std::vector<std::string> r;
- SplitStringDontTrim("\t\ta\t", '\t', &r);
+ SplitStringDontTrim(" ", '*', &r);
+ ASSERT_EQ(1U, r.size());
+ EXPECT_EQ(r[0], " ");
+ r.clear();
+
+ SplitStringDontTrim("\t \ta\t ", '\t', &r);
ASSERT_EQ(4U, r.size());
EXPECT_EQ(r[0], "");
- EXPECT_EQ(r[1], "");
+ EXPECT_EQ(r[1], " ");
EXPECT_EQ(r[2], "a");
- EXPECT_EQ(r[3], "");
+ EXPECT_EQ(r[3], " ");
r.clear();
SplitStringDontTrim("\ta\t\nb\tcc", '\n', &r);
diff --git a/chrome/common/extensions/api/extension_api.cc b/chrome/common/extensions/api/extension_api.cc
index 6bbd8df..3178975 100644
--- a/chrome/common/extensions/api/extension_api.cc
+++ b/chrome/common/extensions/api/extension_api.cc
@@ -268,10 +268,12 @@ bool ExtensionAPI::IsPrivileged(const std::string& full_name) {
std::vector<std::string> split;
base::SplitString(full_name, '.', &split);
std::reverse(split.begin(), split.end());
+ CHECK(!split.empty()); // |full_name| was empty or only whitespace.
api_name = split.back();
split.pop_back();
if (api_name == "experimental") {
+ CHECK(!split.empty()); // |full_name| was "experimental" alone.
api_name += "." + split.back();
split.pop_back();
}
diff --git a/chrome/common/extensions/api/extension_api_unittest.cc b/chrome/common/extensions/api/extension_api_unittest.cc
index bf240e1..1c5a22e3 100644
--- a/chrome/common/extensions/api/extension_api_unittest.cc
+++ b/chrome/common/extensions/api/extension_api_unittest.cc
@@ -26,7 +26,6 @@ TEST(ExtensionAPI, IsPrivileged) {
EXPECT_TRUE(extension_api.IsPrivileged("extension.lastError"));
// Default unknown names to privileged for paranoia's sake.
- EXPECT_TRUE(extension_api.IsPrivileged(""));
EXPECT_TRUE(extension_api.IsPrivileged("<unknown-namespace>"));
EXPECT_TRUE(extension_api.IsPrivileged("extension.<unknown-member>"));
diff --git a/net/base/mime_util.cc b/net/base/mime_util.cc
index f9e72a4..6a5bf73 100644
--- a/net/base/mime_util.cc
+++ b/net/base/mime_util.cc
@@ -55,18 +55,24 @@ class MimeUtil : public PlatformMimeUtil {
private:
friend struct base::DefaultLazyInstanceTraits<MimeUtil>;
- MimeUtil() {
- InitializeMimeTypeMaps();
- }
+
+ typedef base::hash_set<std::string> MimeMappings;
+ typedef std::map<std::string, MimeMappings> StrictMappings;
+
+ MimeUtil();
+
+ // Returns true if |codecs| is nonempty and all the items in it are present in
+ // |supported_codecs|.
+ static bool AreSupportedCodecs(const MimeMappings& supported_codecs,
+ const std::vector<std::string>& codecs);
// For faster lookup, keep hash sets.
void InitializeMimeTypeMaps();
- bool GetMimeTypeFromExtensionHelper(
- const FilePath::StringType& ext, bool include_platform_types,
- std::string* mime_type) const;
+ bool GetMimeTypeFromExtensionHelper(const FilePath::StringType& ext,
+ bool include_platform_types,
+ std::string* mime_type) const;
- typedef base::hash_set<std::string> MimeMappings;
MimeMappings image_map_;
MimeMappings media_map_;
MimeMappings non_image_map_;
@@ -74,7 +80,6 @@ class MimeUtil : public PlatformMimeUtil {
MimeMappings view_source_map_;
MimeMappings codecs_map_;
- typedef std::map<std::string, base::hash_set<std::string> > StrictMappings;
StrictMappings strict_format_map_;
}; // class MimeUtil
@@ -158,7 +163,8 @@ bool MimeUtil::GetMimeTypeFromExtension(const FilePath::StringType& ext,
}
bool MimeUtil::GetWellKnownMimeTypeFromExtension(
- const FilePath::StringType& ext, string* result) const {
+ const FilePath::StringType& ext,
+ string* result) const {
return GetMimeTypeFromExtensionHelper(ext, false, result);
}
@@ -170,9 +176,9 @@ bool MimeUtil::GetMimeTypeFromFile(const FilePath& file_path,
return GetMimeTypeFromExtension(file_name_str.substr(1), result);
}
-bool MimeUtil::GetMimeTypeFromExtensionHelper(
- const FilePath::StringType& ext, bool include_platform_types,
- string* result) const {
+bool MimeUtil::GetMimeTypeFromExtensionHelper(const FilePath::StringType& ext,
+ bool include_platform_types,
+ string* result) const {
// Avoids crash when unable to handle a long file path. See crbug.com/48733.
const unsigned kMaxFilePathSize = 65536;
if (ext.length() > kMaxFilePathSize)
@@ -346,6 +352,20 @@ static const MediaFormatStrict format_codec_mappings[] = {
{ "audio/wav", "1" }
};
+MimeUtil::MimeUtil() {
+ InitializeMimeTypeMaps();
+}
+
+// static
+bool MimeUtil::AreSupportedCodecs(const MimeMappings& supported_codecs,
+ const std::vector<std::string>& codecs) {
+ for (size_t i = 0; i < codecs.size(); ++i) {
+ if (supported_codecs.find(codecs[i]) == supported_codecs.end())
+ return false;
+ }
+ return !codecs.empty();
+}
+
void MimeUtil::InitializeMimeTypeMaps() {
for (size_t i = 0; i < arraysize(supported_image_types); ++i)
image_map_.insert(supported_image_types[i]);
@@ -412,8 +432,8 @@ bool MimeUtil::IsSupportedMimeType(const std::string& mime_type) const {
IsSupportedNonImageMimeType(mime_type.c_str());
}
-bool MimeUtil::MatchesMimeType(const std::string &mime_type_pattern,
- const std::string &mime_type) const {
+bool MimeUtil::MatchesMimeType(const std::string& mime_type_pattern,
+ const std::string& mime_type) const {
// verify caller is passing lowercase
DCHECK_EQ(StringToLowerASCII(mime_type_pattern), mime_type_pattern);
DCHECK_EQ(StringToLowerASCII(mime_type), mime_type);
@@ -451,12 +471,7 @@ bool MimeUtil::MatchesMimeType(const std::string &mime_type_pattern,
bool MimeUtil::AreSupportedMediaCodecs(
const std::vector<std::string>& codecs) const {
- for (size_t i = 0; i < codecs.size(); ++i) {
- if (codecs_map_.find(codecs[i]) == codecs_map_.end()) {
- return false;
- }
- }
- return true;
+ return AreSupportedCodecs(codecs_map_, codecs);
}
void MimeUtil::ParseCodecString(const std::string& codecs,
@@ -485,20 +500,12 @@ bool MimeUtil::IsStrictMediaMimeType(const std::string& mime_type) const {
return true;
}
-bool MimeUtil::IsSupportedStrictMediaMimeType(const std::string& mime_type,
+bool MimeUtil::IsSupportedStrictMediaMimeType(
+ const std::string& mime_type,
const std::vector<std::string>& codecs) const {
StrictMappings::const_iterator it = strict_format_map_.find(mime_type);
-
- if (it == strict_format_map_.end())
- return false;
-
- const MimeMappings strict_codecs_map = it->second;
- for (size_t i = 0; i < codecs.size(); ++i) {
- if (strict_codecs_map.find(codecs[i]) == strict_codecs_map.end()) {
- return false;
- }
- }
- return true;
+ return (it != strict_format_map_.end()) &&
+ AreSupportedCodecs(it->second, codecs);
}
//----------------------------------------------------------------------------
diff --git a/net/base/mime_util_unittest.cc b/net/base/mime_util_unittest.cc
index a63c39e..c647294 100644
--- a/net/base/mime_util_unittest.cc
+++ b/net/base/mime_util_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
@@ -104,26 +104,26 @@ TEST(MimeUtilTest, ParseCodecString) {
{ "\"mp4v.20.240, mp4a.40.2\"", 2, { "mp4v", "mp4a" } },
{ "mp4v.20.8, samr", 2, { "mp4v", "samr" } },
{ "\"theora, vorbis\"", 2, { "theora", "vorbis" } },
- { "", 1, { "" } },
- { "\"\"", 1, { "" } },
+ { "", 0, { } },
+ { "\"\"", 0, { } },
+ { "\" \"", 0, { } },
{ ",", 2, { "", "" } },
};
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); ++i) {
std::vector<std::string> codecs_out;
ParseCodecString(tests[i].original, &codecs_out, true);
- EXPECT_EQ(tests[i].expected_size, codecs_out.size());
- for (size_t j = 0; j < tests[i].expected_size; ++j) {
+ ASSERT_EQ(tests[i].expected_size, codecs_out.size());
+ for (size_t j = 0; j < tests[i].expected_size; ++j)
EXPECT_EQ(tests[i].results[j], codecs_out[j]);
- }
}
// Test without stripping the codec type.
std::vector<std::string> codecs_out;
ParseCodecString("avc1.42E01E, mp4a.40.2", &codecs_out, false);
- EXPECT_EQ(2u, codecs_out.size());
- EXPECT_STREQ("avc1.42E01E", codecs_out[0].c_str());
- EXPECT_STREQ("mp4a.40.2", codecs_out[1].c_str());
+ ASSERT_EQ(2u, codecs_out.size());
+ EXPECT_EQ("avc1.42E01E", codecs_out[0]);
+ EXPECT_EQ("mp4a.40.2", codecs_out[1]);
}
} // namespace net
generated by cgit v1.1 at 2025-02-11 17:47:46 +0000