Rename enums/functions that collide in chromium style in core/html/.

third_party/WebKit/Source/core/html/parser/HTMLTokenizer.h

 /*
  * Copyright (C) 2008 Apple Inc. All Rights Reserved.
  * Copyright (C) 2010 Google, Inc. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 143 matching lines @@
     //    instead of as character tokens.
     //
     void updateStateFor(const String& tagName);
 
     bool forceNullCharacterReplacement() const { return m_forceNullCharacterReplacement; }
     void setForceNullCharacterReplacement(bool value) { m_forceNullCharacterReplacement = value; }
 
     bool shouldAllowCDATA() const { return m_shouldAllowCDATA; }
     void setShouldAllowCDATA(bool value) { m_shouldAllowCDATA = value; }
 
-    State state() const { return m_state; }
+    State getState() const { return m_state; }
     void setState(State state) { m_state = state; }
 
     inline bool shouldSkipNullCharacters() const
     {
         return !m_forceNullCharacterReplacement
             && (m_state == HTMLTokenizer::DataState
                 || m_state == HTMLTokenizer::RCDATAState
                 || m_state == HTMLTokenizer::RAWTEXTState);
     }
 
@@ skipping 86 matching lines @@
     // token (e.g., when lexing script). We buffer the name of the end tag
     // token here so we remember it next time we re-enter the tokenizer.
     Vector<LChar, 32> m_bufferedEndTagName;
 
     HTMLParserOptions m_options;
 };
 
 } // namespace blink
 
 #endif