ABANDONED CL: Changes needed to make things compile after running rewrite_to_chrome_style tool.

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

 // Copyright 2014 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.
 
 #include "core/css/parser/CSSTokenizer.h"
 
 namespace blink {
 #include "core/CSSTokenizerCodepoints.cpp"
 }
 
@@ skipping 192 matching lines @@
 }
 
 CSSParserToken CSSTokenizer::colon(UChar cc) {
   return CSSParserToken(ColonToken);
 }
 
 CSSParserToken CSSTokenizer::semiColon(UChar cc) {
   return CSSParserToken(SemicolonToken);
 }
 
+/* DO NOT SUBMIT - Merge conflict resolution marker.
+ * Please spell |Hash| below (not |GetHash|). */
 CSSParserToken CSSTokenizer::hash(UChar cc) {
   UChar nextChar = m_input.peekWithoutReplacement(0);
   if (isNameCodePoint(nextChar) ||
       twoCharsAreValidEscape(nextChar, m_input.peekWithoutReplacement(1))) {
     HashTokenType type =
         nextCharsAreIdentifier() ? HashTokenId : HashTokenUnrestricted;
     return CSSParserToken(type, consumeName());
   }
 
   return CSSParserToken(DelimiterToken, cc);
@@ skipping 452 matching lines @@
   reconsume(first);
   return areIdentifier;
 }
 
 StringView CSSTokenizer::registerString(const String& string) {
   m_stringPool.push_back(string);
   return string;
 }
 
 }  // namespace blink