ParsedContentType refactoring

third_party/WebKit/Source/platform/network/ParsedContentTypeTest.cpp

Index: third_party/WebKit/Source/platform/network/ParsedContentTypeTest.cpp
diff --git a/third_party/WebKit/Source/platform/network/ParsedContentTypeTest.cpp b/third_party/WebKit/Source/platform/network/ParsedContentTypeTest.cpp
index 64ed0d18e5c1b125cfdbd2435def0b4b10279801..ca7326de24d294409cbadd5347d50fbb7245d8df 100644
--- a/third_party/WebKit/Source/platform/network/ParsedContentTypeTest.cpp
+++ b/third_party/WebKit/Source/platform/network/ParsedContentTypeTest.cpp
@@ -47,24 +47,25 @@ TEST(ParsedContentTypeTest, InvalidMimeTypeWithCharset) {
 }
 
 TEST(ParsedContentTypeTest, Validity) {
-  EXPECT_TRUE(isValidContentType("text/plain"));
-  EXPECT_TRUE(isValidContentType("text/plain; charset=utf-8"));
-  EXPECT_TRUE(isValidContentType("  text/plain  "));
-  EXPECT_TRUE(isValidContentType(" text/plain;charset=utf-8  "));
-  EXPECT_TRUE(isValidContentType("unknown/unknown"));
-  EXPECT_TRUE(isValidContentType("unknown/unknown; charset=unknown"));
-  EXPECT_TRUE(isValidContentType("x/y;\"z=\\\"q;t\"=\"ttx&r=z;;kd==\""));
-
-  EXPECT_FALSE(isValidContentType("text/plain\r"));
-  EXPECT_FALSE(isValidContentType("text/plain\n"));
-  EXPECT_FALSE(isValidContentType(""));
-  EXPECT_FALSE(isValidContentType("   "));
-  EXPECT_FALSE(isValidContentType("text/plain;"));
-  EXPECT_FALSE(isValidContentType("text/plain;  "));
-  EXPECT_FALSE(isValidContentType("text/plain; charset"));
-  EXPECT_FALSE(isValidContentType("text/plain; charset;"));
-  EXPECT_FALSE(isValidContentType("x/y;\"xx"));
-  EXPECT_FALSE(isValidContentType("x/y;\"xx=y"));
+  EXPECT_TRUE(ParsedContentType::isValid("text/plain"));
+  EXPECT_TRUE(ParsedContentType::isValid("text/plain; charset=utf-8"));
+  EXPECT_TRUE(ParsedContentType::isValid("  text/plain  "));
+  EXPECT_TRUE(ParsedContentType::isValid(" text/plain;charset=utf-8  "));
+  EXPECT_TRUE(ParsedContentType::isValid("unknown/unknown"));
+  EXPECT_TRUE(ParsedContentType::isValid("unknown/unknown; charset=unknown"));
+  EXPECT_TRUE(
+      ParsedContentType::isValid("x/y;\"z=\\\"q;t\"=\"ttx&r=z;;kd==\""));
+
+  EXPECT_FALSE(ParsedContentType::isValid("text/plain\r"));
+  EXPECT_FALSE(ParsedContentType::isValid("text/plain\n"));
+  EXPECT_FALSE(ParsedContentType::isValid(""));
+  EXPECT_FALSE(ParsedContentType::isValid("   "));
+  EXPECT_FALSE(ParsedContentType::isValid("text/plain;"));
+  EXPECT_FALSE(ParsedContentType::isValid("text/plain;  "));
+  EXPECT_FALSE(ParsedContentType::isValid("text/plain; charset"));
+  EXPECT_FALSE(ParsedContentType::isValid("text/plain; charset;"));
+  EXPECT_FALSE(ParsedContentType::isValid("x/y;\"xx"));
+  EXPECT_FALSE(ParsedContentType::isValid("x/y;\"xx=y"));
 
   // TODO(yhirano): Add tests for non-tokens. They are currently accepted.
 }