ABANDONED CL: Changes to compile and pass tests after Big Blink Rename (excluding functions).

third_party/WebKit/Source/core/css/parser/CSSTokenizerTest.cpp

Index: third_party/WebKit/Source/core/css/parser/CSSTokenizerTest.cpp
diff --git a/third_party/WebKit/Source/core/css/parser/CSSTokenizerTest.cpp b/third_party/WebKit/Source/core/css/parser/CSSTokenizerTest.cpp
index 95688c0c29e4086a413f5fc1464eaad6b26a364a..dcb384c3b3d643c37bb56950609faddc20e319c5 100644
--- a/third_party/WebKit/Source/core/css/parser/CSSTokenizerTest.cpp
+++ b/third_party/WebKit/Source/core/css/parser/CSSTokenizerTest.cpp
@@ -165,25 +165,25 @@ String fromUChar32(UChar32 c) {
 }
 
 TEST(CSSTokenizerTest, SingleCharacterTokens) {
-  TEST_TOKENS("(", leftParenthesis());
-  TEST_TOKENS(")", rightParenthesis());
-  TEST_TOKENS("[", leftBracket());
-  TEST_TOKENS("]", rightBracket());
+  TEST_TOKENS("(", left_parenthesis());
+  TEST_TOKENS(")", right_parenthesis());
+  TEST_TOKENS("[", left_bracket());
+  TEST_TOKENS("]", right_bracket());
   TEST_TOKENS(",", comma());
   TEST_TOKENS(":", colon());
   TEST_TOKENS(";", semicolon());
-  TEST_TOKENS(")[", rightParenthesis(), leftBracket());
-  TEST_TOKENS("[)", leftBracket(), rightParenthesis());
-  TEST_TOKENS("{}", leftBrace(), rightBrace());
+  TEST_TOKENS(")[", right_parenthesis(), left_bracket());
+  TEST_TOKENS("[)", left_bracket(), right_parenthesis());
+  TEST_TOKENS("{}", left_brace(), right_brace());
   TEST_TOKENS(",,", comma(), comma());
 }
 
 TEST(CSSTokenizerTest, MultipleCharacterTokens) {
-  TEST_TOKENS("~=", includeMatch());
-  TEST_TOKENS("|=", dashMatch());
-  TEST_TOKENS("^=", prefixMatch());
-  TEST_TOKENS("$=", suffixMatch());
-  TEST_TOKENS("*=", substringMatch());
+  TEST_TOKENS("~=", include_match());
+  TEST_TOKENS("|=", dash_match());
+  TEST_TOKENS("^=", prefix_match());
+  TEST_TOKENS("$=", suffix_match());
+  TEST_TOKENS("*=", substring_match());
   TEST_TOKENS("||", column());
   TEST_TOKENS("|||", column(), delim('|'));
   TEST_TOKENS("<!--", cdo());
@@ -273,7 +273,7 @@ TEST(CSSTokenizerTest, IdentToken) {
 
 TEST(CSSTokenizerTest, FunctionToken) {
   TEST_TOKENS("scale(2)", function("scale"),
-              number(IntegerValueType, 2, NoSign), rightParenthesis());
+              number(kIntegerValueType, 2, kNoSign), right_parenthesis());
   TEST_TOKENS("foo-bar\\ baz(", function("foo-bar baz"));
   TEST_TOKENS("fun\\(ction(", function("fun(ction"));
   TEST_TOKENS("-foo(", function("-foo"));
@@ -314,15 +314,15 @@ TEST(CSSTokenizerTest, UrlToken) {
   TEST_TOKENS("URL(eof", url("eof"));
   TEST_TOKENS("url(not/*a*/comment)", url("not/*a*/comment"));
   TEST_TOKENS("urL()", url(""));
-  TEST_TOKENS("uRl(white space),", badUrl(), comma());
-  TEST_TOKENS("Url(b(ad),", badUrl(), comma());
-  TEST_TOKENS("uRl(ba'd):", badUrl(), colon());
-  TEST_TOKENS("urL(b\"ad):", badUrl(), colon());
-  TEST_TOKENS("uRl(b\"ad):", badUrl(), colon());
-  TEST_TOKENS("Url(b\\\rad):", badUrl(), colon());
-  TEST_TOKENS("url(b\\\nad):", badUrl(), colon());
-  TEST_TOKENS("url(/*'bad')*/", badUrl(), delim('*'), delim('/'));
-  TEST_TOKENS("url(ba'd\\\\))", badUrl(), rightParenthesis());
+  TEST_TOKENS("uRl(white space),", bad_url(), comma());
+  TEST_TOKENS("Url(b(ad),", bad_url(), comma());
+  TEST_TOKENS("uRl(ba'd):", bad_url(), colon());
+  TEST_TOKENS("urL(b\"ad):", bad_url(), colon());
+  TEST_TOKENS("uRl(b\"ad):", bad_url(), colon());
+  TEST_TOKENS("Url(b\\\rad):", bad_url(), colon());
+  TEST_TOKENS("url(b\\\nad):", bad_url(), colon());
+  TEST_TOKENS("url(/*'bad')*/", bad_url(), delim('*'), delim('/'));
+  TEST_TOKENS("url(ba'd\\\\))", bad_url(), right_parenthesis());
 }
 
 TEST(CSSTokenizerTest, StringToken) {
@@ -339,10 +339,10 @@ TEST(CSSTokenizerTest, StringToken) {
   TEST_TOKENS("\"esc\\\faped\"", string("escaped"));
   TEST_TOKENS("'new\\\rline'", string("newline"));
   TEST_TOKENS("\"new\\\r\nline\"", string("newline"));
-  TEST_TOKENS("'bad\nstring", badString(), whitespace(), ident("string"));
-  TEST_TOKENS("'bad\rstring", badString(), whitespace(), ident("string"));
-  TEST_TOKENS("'bad\r\nstring", badString(), whitespace(), ident("string"));
-  TEST_TOKENS("'bad\fstring", badString(), whitespace(), ident("string"));
+  TEST_TOKENS("'bad\nstring", bad_string(), whitespace(), ident("string"));
+  TEST_TOKENS("'bad\rstring", bad_string(), whitespace(), ident("string"));
+  TEST_TOKENS("'bad\r\nstring", bad_string(), whitespace(), ident("string"));
+  TEST_TOKENS("'bad\fstring", bad_string(), whitespace(), ident("string"));
   TEST_TOKENS(String("'\0'", 3), string(fromUChar32(0xFFFD)));
   TEST_TOKENS(String("'hel\0lo'", 8),
               string("hel" + fromUChar32(0xFFFD) + "lo"));
@@ -452,7 +452,7 @@ TEST(CSSTokenizerTest, CommentToken) {
   TEST_TOKENS("/*comment*/a", ident("a"));
   TEST_TOKENS("/**\\2f**//", delim('/'));
   TEST_TOKENS("/**y*a*y**/ ", whitespace());
-  TEST_TOKENS(",/* \n :) \n */)", comma(), rightParenthesis());
+  TEST_TOKENS(",/* \n :) \n */)", comma(), right_parenthesis());
   TEST_TOKENS(":/*/*/", colon());
   TEST_TOKENS("/**/*", delim('*'));
   TEST_TOKENS(";/******", semicolon());