Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1811)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/renderer/manifest/manifest_parser_unittest.cc

Issue 1176583003: Move EqualsASCII to the base namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@string_util2
Patch Set: Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/drop_data_builder.cc ('k') | content/renderer/npapi/webplugin_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/manifest/manifest_parser_unittest.cc
diff --git a/content/renderer/manifest/manifest_parser_unittest.cc b/content/renderer/manifest/manifest_parser_unittest.cc
index 948d5500aa7cbaf768132063461fbc87e15d21cf..39384f8be7598d7b36e2f375f1d4d458af4ac02a 100644
--- a/content/renderer/manifest/manifest_parser_unittest.cc
+++ b/content/renderer/manifest/manifest_parser_unittest.cc
@@ -127,7 +127,7 @@ TEST_F(ManifestParserTest, NameParseRules) {
// Smoke test.
{
Manifest manifest = ParseManifest("{ \"name\": \"foo\" }");
- ASSERT_TRUE(EqualsASCII(manifest.name.string(), "foo"));
+ ASSERT_TRUE(base::EqualsASCII(manifest.name.string(), "foo"));
ASSERT_FALSE(manifest.IsEmpty());
EXPECT_EQ(0u, GetErrorCount());
}
@@ -135,7 +135,7 @@ TEST_F(ManifestParserTest, NameParseRules) {
// Trim whitespaces.
{
Manifest manifest = ParseManifest("{ \"name\": \" foo \" }");
- ASSERT_TRUE(EqualsASCII(manifest.name.string(), "foo"));
+ ASSERT_TRUE(base::EqualsASCII(manifest.name.string(), "foo"));
EXPECT_EQ(0u, GetErrorCount());
}
@@ -164,7 +164,7 @@ TEST_F(ManifestParserTest, ShortNameParseRules) {
// Smoke test.
{
Manifest manifest = ParseManifest("{ \"short_name\": \"foo\" }");
- ASSERT_TRUE(EqualsASCII(manifest.short_name.string(), "foo"));
+ ASSERT_TRUE(base::EqualsASCII(manifest.short_name.string(), "foo"));
ASSERT_FALSE(manifest.IsEmpty());
EXPECT_EQ(0u, GetErrorCount());
}
@@ -172,7 +172,7 @@ TEST_F(ManifestParserTest, ShortNameParseRules) {
// Trim whitespaces.
{
Manifest manifest = ParseManifest("{ \"short_name\": \" foo \" }");
- ASSERT_TRUE(EqualsASCII(manifest.short_name.string(), "foo"));
+ ASSERT_TRUE(base::EqualsASCII(manifest.short_name.string(), "foo"));
EXPECT_EQ(0u, GetErrorCount());
}
@@ -568,7 +568,7 @@ TEST_F(ManifestParserTest, IconTypeParseRules) {
{
Manifest manifest =
ParseManifest("{ \"icons\": [ {\"src\": \"\", \"type\": \"foo\" } ] }");
- EXPECT_TRUE(EqualsASCII(manifest.icons[0].type.string(), "foo"));
+ EXPECT_TRUE(base::EqualsASCII(manifest.icons[0].type.string(), "foo"));
EXPECT_EQ(0u, GetErrorCount());
}
@@ -576,7 +576,7 @@ TEST_F(ManifestParserTest, IconTypeParseRules) {
{
Manifest manifest = ParseManifest("{ \"icons\": [ {\"src\": \"\","
" \"type\": \" foo \" } ] }");
- EXPECT_TRUE(EqualsASCII(manifest.icons[0].type.string(), "foo"));
+ EXPECT_TRUE(base::EqualsASCII(manifest.icons[0].type.string(), "foo"));
EXPECT_EQ(0u, GetErrorCount());
}
@@ -860,8 +860,9 @@ TEST_F(ManifestParserTest, RelatedApplicationsParseRules) {
"{ \"related_applications\": ["
"{\"platform\": \"play\", \"url\": \"http://www.foo.com\"}]}");
EXPECT_EQ(manifest.related_applications.size(), 1u);
- EXPECT_TRUE(EqualsASCII(manifest.related_applications[0].platform.string(),
- "play"));
+ EXPECT_TRUE(base::EqualsASCII(
+ manifest.related_applications[0].platform.string(),
+ "play"));
EXPECT_EQ(manifest.related_applications[0].url.spec(),
"http://www.foo.com/");
EXPECT_FALSE(manifest.IsEmpty());
@@ -874,10 +875,11 @@ TEST_F(ManifestParserTest, RelatedApplicationsParseRules) {
"{ \"related_applications\": ["
"{\"platform\": \"itunes\", \"id\": \"foo\"}]}");
EXPECT_EQ(manifest.related_applications.size(), 1u);
- EXPECT_TRUE(EqualsASCII(manifest.related_applications[0].platform.string(),
- "itunes"));
- EXPECT_TRUE(EqualsASCII(manifest.related_applications[0].id.string(),
- "foo"));
+ EXPECT_TRUE(base::EqualsASCII(
+ manifest.related_applications[0].platform.string(),
+ "itunes"));
+ EXPECT_TRUE(base::EqualsASCII(manifest.related_applications[0].id.string(),
+ "foo"));
EXPECT_FALSE(manifest.IsEmpty());
EXPECT_EQ(0u, GetErrorCount());
}
@@ -889,14 +891,16 @@ TEST_F(ManifestParserTest, RelatedApplicationsParseRules) {
"{\"platform\": \"play\", \"id\": \"foo\"},"
"{\"platform\": \"itunes\", \"id\": \"bar\"}]}");
EXPECT_EQ(manifest.related_applications.size(), 2u);
- EXPECT_TRUE(EqualsASCII(manifest.related_applications[0].platform.string(),
- "play"));
- EXPECT_TRUE(EqualsASCII(manifest.related_applications[0].id.string(),
- "foo"));
- EXPECT_TRUE(EqualsASCII(manifest.related_applications[1].platform.string(),
- "itunes"));
- EXPECT_TRUE(EqualsASCII(manifest.related_applications[1].id.string(),
- "bar"));
+ EXPECT_TRUE(base::EqualsASCII(
+ manifest.related_applications[0].platform.string(),
+ "play"));
+ EXPECT_TRUE(base::EqualsASCII(manifest.related_applications[0].id.string(),
+ "foo"));
+ EXPECT_TRUE(base::EqualsASCII(
+ manifest.related_applications[1].platform.string(),
+ "itunes"));
+ EXPECT_TRUE(base::EqualsASCII(manifest.related_applications[1].id.string(),
+ "bar"));
EXPECT_FALSE(manifest.IsEmpty());
EXPECT_EQ(0u, GetErrorCount());
}
@@ -910,10 +914,11 @@ TEST_F(ManifestParserTest, RelatedApplicationsParseRules) {
"{\"platform\": \"play\", \"id\": \"foo\"},"
"{}]}");
EXPECT_EQ(manifest.related_applications.size(), 1u);
- EXPECT_TRUE(EqualsASCII(manifest.related_applications[0].platform.string(),
- "play"));
- EXPECT_TRUE(EqualsASCII(manifest.related_applications[0].id.string(),
- "foo"));
+ EXPECT_TRUE(base::EqualsASCII(
+ manifest.related_applications[0].platform.string(),
+ "play"));
+ EXPECT_TRUE(base::EqualsASCII(manifest.related_applications[0].id.string(),
+ "foo"));
EXPECT_FALSE(manifest.IsEmpty());
EXPECT_EQ(2u, GetErrorCount());
EXPECT_EQ("Manifest parsing error: one of 'url' or 'id' is required, "
@@ -978,14 +983,14 @@ TEST_F(ManifestParserTest, GCMSenderIDParseRules) {
// Smoke test.
{
Manifest manifest = ParseManifest("{ \"gcm_sender_id\": \"foo\" }");
- EXPECT_TRUE(EqualsASCII(manifest.gcm_sender_id.string(), "foo"));
+ EXPECT_TRUE(base::EqualsASCII(manifest.gcm_sender_id.string(), "foo"));
EXPECT_EQ(0u, GetErrorCount());
}
// Trim whitespaces.
{
Manifest manifest = ParseManifest("{ \"gcm_sender_id\": \" foo \" }");
- EXPECT_TRUE(EqualsASCII(manifest.gcm_sender_id.string(), "foo"));
+ EXPECT_TRUE(base::EqualsASCII(manifest.gcm_sender_id.string(), "foo"));
EXPECT_EQ(0u, GetErrorCount());
}
« no previous file with comments | « content/renderer/drop_data_builder.cc ('k') | content/renderer/npapi/webplugin_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698