Clean-up blink_idl_parser

third_party/WebKit/Source/bindings/scripts/blink_idl_parser.py

Index: third_party/WebKit/Source/bindings/scripts/blink_idl_parser.py
diff --git a/third_party/WebKit/Source/bindings/scripts/blink_idl_parser.py b/third_party/WebKit/Source/bindings/scripts/blink_idl_parser.py
index 31b508df9ca558d61fc695feb11627a0e12d68ad..410102f283494caf5ed414a31c20c966a38a1772 100644
--- a/third_party/WebKit/Source/bindings/scripts/blink_idl_parser.py
+++ b/third_party/WebKit/Source/bindings/scripts/blink_idl_parser.py
@@ -203,17 +203,6 @@ class BlinkIDLParser(IDLParser):
     # Numbers are as per Candidate Recommendation 19 April 2012:
     # http://www.w3.org/TR/2012/CR-WebIDL-20120419/
 
-    # [3] Override action, since we distinguish callbacks
-    # FIXME: Upstream
-    def p_CallbackOrInterface(self, p):
-        """CallbackOrInterface : CALLBACK CallbackRestOrInterface
-                               | Interface"""
-        if len(p) > 2:
-            p[2].AddChildren(self.BuildTrue('CALLBACK'))
-            p[0] = p[2]
-        else:
-            p[0] = p[1]
-
     # [b27] Add strings, more 'Literal' productions
     # 'Literal's needed because integers and strings are both internally strings
     def p_ConstValue(self, p):
@@ -308,17 +297,6 @@ class BlinkIDLParser(IDLParser):
                              | ExtendedAttributeStringLiteralList"""
         p[0] = p[1]
 
-    # [70] Override base parser to remove non-standard sized array
-    # FIXME: Upstream
-    def p_TypeSuffix(self, p):
-        """TypeSuffix : '[' ']' TypeSuffix
-                      | '?' TypeSuffixStartingWithArray
-                      |"""
-        if len(p) == 4:
-            p[0] = self.BuildProduction('Array', p, 1, p[3])
-        elif len(p) == 3:
-            p[0] = ListFromConcat(self.BuildTrue('NULLABLE'), p[2])
-
     # Blink extension: Add support for string literal Extended Attribute values
     def p_ExtendedAttributeStringLiteral(self, p):
         """ExtendedAttributeStringLiteral : identifier '=' StringLiteral """