Dartium Roll 38 roll

bindings/dart/scripts/dart_callback_interface.py

Index: bindings/dart/scripts/dart_callback_interface.py
diff --git a/bindings/dart/scripts/dart_callback_interface.py b/bindings/dart/scripts/dart_callback_interface.py
index 9fb0ceae14e0ffacf0a17c7721914f72b819c4a7..5120af47c526d6a4c9a754533c5adf9768d48b8f 100644
--- a/bindings/dart/scripts/dart_callback_interface.py
+++ b/bindings/dart/scripts/dart_callback_interface.py
@@ -33,18 +33,18 @@ Extends IdlType with property |callback_cpp_type|.
 Design doc: http://www.chromium.org/developers/design-documents/idl-compiler
 """
 
-from idl_types import IdlType
+from idl_types import IdlType, IdlTypeBase
 import dart_types
 from dart_utilities import DartUtilities
 from v8_globals import includes
 
 CALLBACK_INTERFACE_H_INCLUDES = frozenset([
-    'bindings/dart/DartCallback.h',
-    'bindings/dart/DartDOMWrapper.h',
-    'bindings/v8/ActiveDOMCallback.h',
+    'bindings/core/dart/DartCallback.h',
+    'bindings/core/dart/DartDOMWrapper.h',
+    'bindings/core/v8/ActiveDOMCallback.h',
 ])
 CALLBACK_INTERFACE_CPP_INCLUDES = frozenset([
-    'bindings/dart/DartBindingsCommonIncludes.h',
+    'bindings/core/dart/DartBindingsCommonIncludes.h',
     'wtf/GetPtr.h',
     'wtf/RefPtr.h',
 ])
@@ -57,13 +57,13 @@ def cpp_type(idl_type):
         return 'const String&'
     if idl_type_name == 'void':
         return 'void'
-    # Callbacks use raw pointers, so used_as_argument=True
-    usual_cpp_type = idl_type.cpp_type_args(used_as_argument=True)
+    # Callbacks use raw pointers, so raw_type=True
+    usual_cpp_type = idl_type.cpp_type_args(raw_type=True)
     if usual_cpp_type.startswith(('Vector', 'HeapVector', 'WillBeHeapVector')):
         return 'const %s&' % usual_cpp_type
     return usual_cpp_type
 
-IdlType.callback_cpp_type = property(cpp_type)
+IdlTypeBase.callback_cpp_type = property(cpp_type)
 
 
 def generate_callback_interface(callback_interface):