diff --git a/src/cobalt/bindings/testing/global_constructors_idls_idl_files_list.tmp b/src/cobalt/bindings/testing/global_constructors_idls_idl_files_list.tmp
new file mode 100644
index 0000000..1f9a3fc
--- /dev/null
+++ b/src/cobalt/bindings/testing/global_constructors_idls_idl_files_list.tmp
@@ -0,0 +1,45 @@
+AnonymousIndexedGetterInterface.idl
+AnonymousNamedGetterInterface.idl
+AnonymousNamedIndexedGetterInterface.idl
+ArbitraryInterface.idl
+BaseInterface.idl
+BooleanTypeTestInterface.idl
+CallbackFunctionInterface.idl
+CallbackInterfaceInterface.idl
+ConditionalInterface.idl
+ConstantsInterface.idl
+ConstructorInterface.idl
+ConstructorWithArgumentsInterface.idl
+DerivedGetterSetterInterface.idl
+DerivedInterface.idl
+DisabledInterface.idl
+DOMStringTestInterface.idl
+EnumerationInterface.idl
+ExceptionObjectInterface.idl
+ExceptionsInterface.idl
+ExtendedIDLAttributesInterface.idl
+GarbageCollectionTestInterface.idl
+GetOpaqueRootInterface.idl
+GlobalInterfaceParent.idl
+IndexedGetterInterface.idl
+InterfaceWithUnsupportedProperties.idl
+NamedConstructorInterface.idl
+NamedGetterInterface.idl
+NamedIndexedGetterInterface.idl
+NestedPutForwardsInterface.idl
+NoConstructorInterface.idl
+NoInterfaceObjectInterface.idl
+NullableTypesTestInterface.idl
+NumericTypesTestInterface.idl
+ObjectTypeBindingsInterface.idl
+OperationsTestInterface.idl
+PutForwardsInterface.idl
+SingleOperationInterface.idl
+StringifierAnonymousOperationInterface.idl
+StringifierAttributeInterface.idl
+StringifierOperationInterface.idl
+StaticPropertiesInterface.idl
+TargetInterface.idl
+UnionTypesInterface.idl
+Window.idl
+UnsupportedInterface.idl
diff --git a/src/cobalt/bindings/testing/global_objects_idl_files_list.tmp b/src/cobalt/bindings/testing/global_objects_idl_files_list.tmp
new file mode 100644
index 0000000..c1c7594
--- /dev/null
+++ b/src/cobalt/bindings/testing/global_objects_idl_files_list.tmp
@@ -0,0 +1,44 @@
+AnonymousIndexedGetterInterface.idl
+AnonymousNamedGetterInterface.idl
+AnonymousNamedIndexedGetterInterface.idl
+ArbitraryInterface.idl
+BaseInterface.idl
+BooleanTypeTestInterface.idl
+CallbackFunctionInterface.idl
+CallbackInterfaceInterface.idl
+ConditionalInterface.idl
+ConstantsInterface.idl
+ConstructorInterface.idl
+ConstructorWithArgumentsInterface.idl
+DerivedGetterSetterInterface.idl
+DerivedInterface.idl
+DisabledInterface.idl
+DOMStringTestInterface.idl
+EnumerationInterface.idl
+ExceptionObjectInterface.idl
+ExceptionsInterface.idl
+ExtendedIDLAttributesInterface.idl
+GarbageCollectionTestInterface.idl
+GetOpaqueRootInterface.idl
+GlobalInterfaceParent.idl
+IndexedGetterInterface.idl
+InterfaceWithUnsupportedProperties.idl
+NamedConstructorInterface.idl
+NamedGetterInterface.idl
+NamedIndexedGetterInterface.idl
+NestedPutForwardsInterface.idl
+NoConstructorInterface.idl
+NoInterfaceObjectInterface.idl
+NullableTypesTestInterface.idl
+NumericTypesTestInterface.idl
+ObjectTypeBindingsInterface.idl
+OperationsTestInterface.idl
+PutForwardsInterface.idl
+SingleOperationInterface.idl
+StringifierAnonymousOperationInterface.idl
+StringifierAttributeInterface.idl
+StringifierOperationInterface.idl
+StaticPropertiesInterface.idl
+TargetInterface.idl
+UnionTypesInterface.idl
+Window.idl
diff --git a/src/cobalt/bindings/testing/interfaces_info_individual_static_idl_files_list.tmp b/src/cobalt/bindings/testing/interfaces_info_individual_static_idl_files_list.tmp
new file mode 100644
index 0000000..ff5e547
--- /dev/null
+++ b/src/cobalt/bindings/testing/interfaces_info_individual_static_idl_files_list.tmp
@@ -0,0 +1,48 @@
+AnonymousIndexedGetterInterface.idl
+AnonymousNamedGetterInterface.idl
+AnonymousNamedIndexedGetterInterface.idl
+ArbitraryInterface.idl
+BaseInterface.idl
+BooleanTypeTestInterface.idl
+CallbackFunctionInterface.idl
+CallbackInterfaceInterface.idl
+ConditionalInterface.idl
+ConstantsInterface.idl
+ConstructorInterface.idl
+ConstructorWithArgumentsInterface.idl
+DerivedGetterSetterInterface.idl
+DerivedInterface.idl
+DisabledInterface.idl
+DOMStringTestInterface.idl
+EnumerationInterface.idl
+ExceptionObjectInterface.idl
+ExceptionsInterface.idl
+ExtendedIDLAttributesInterface.idl
+GarbageCollectionTestInterface.idl
+GetOpaqueRootInterface.idl
+GlobalInterfaceParent.idl
+IndexedGetterInterface.idl
+InterfaceWithUnsupportedProperties.idl
+NamedConstructorInterface.idl
+NamedGetterInterface.idl
+NamedIndexedGetterInterface.idl
+NestedPutForwardsInterface.idl
+NoConstructorInterface.idl
+NoInterfaceObjectInterface.idl
+NullableTypesTestInterface.idl
+NumericTypesTestInterface.idl
+ObjectTypeBindingsInterface.idl
+OperationsTestInterface.idl
+PutForwardsInterface.idl
+SingleOperationInterface.idl
+StringifierAnonymousOperationInterface.idl
+StringifierAttributeInterface.idl
+StringifierOperationInterface.idl
+StaticPropertiesInterface.idl
+TargetInterface.idl
+UnionTypesInterface.idl
+Window.idl
+ImplementedInterface.idl
+PartialInterface.idl
+InterfaceWithUnsupportedProperties_partial.idl
+UnsupportedInterface.idl
diff --git a/src/cobalt/browser/global_constructors_idls_idl_files_list.tmp b/src/cobalt/browser/global_constructors_idls_idl_files_list.tmp
new file mode 100644
index 0000000..7c539ab
--- /dev/null
+++ b/src/cobalt/browser/global_constructors_idls_idl_files_list.tmp
@@ -0,0 +1,144 @@
+../audio/AudioBuffer.idl
+../audio/AudioBufferSourceNode.idl
+../audio/AudioContext.idl
+../audio/AudioDestinationNode.idl
+../audio/AudioNode.idl
+../cssom/CSSConditionRule.idl
+../cssom/CSSGroupingRule.idl
+../cssom/CSSFontFaceRule.idl
+../cssom/CSSMediaRule.idl
+../cssom/CSSKeyframeRule.idl
+../cssom/CSSKeyframesRule.idl
+../cssom/CSSRule.idl
+../cssom/CSSRuleList.idl
+../cssom/CSSStyleDeclaration.idl
+../cssom/CSSStyleRule.idl
+../cssom/CSSStyleSheet.idl
+../cssom/MediaList.idl
+../cssom/StyleSheet.idl
+../cssom/StyleSheetList.idl
+../debug/DebugHub.idl
+../debug/Debugger.idl
+../debug/DebuggerEventTarget.idl
+../debug/DebugScriptRunner.idl
+../dom/AnimationEvent.idl
+../dom/ArrayBuffer.idl
+../dom/ArrayBufferView.idl
+../dom/Attr.idl
+../dom/Blob.idl
+../dom/CDATASection.idl
+../dom/CharacterData.idl
+../dom/Comment.idl
+../dom/Console.idl
+../dom/Crypto.idl
+../dom/DataView.idl
+../dom/Document.idl
+../dom/DocumentTimeline.idl
+../dom/DocumentType.idl
+../dom/DOMException.idl
+../dom/DOMImplementation.idl
+../dom/DOMParser.idl
+../dom/DOMRect.idl
+../dom/DOMRectList.idl
+../dom/DOMRectReadOnly.idl
+../dom/DOMStringMap.idl
+../dom/DOMTokenList.idl
+../dom/Element.idl
+../dom/Event.idl
+../dom/EventListener.idl
+../dom/EventTarget.idl
+../dom/Float32Array.idl
+../dom/Float64Array.idl
+../dom/FocusEvent.idl
+../dom/History.idl
+../dom/HTMLAnchorElement.idl
+../dom/HTMLBodyElement.idl
+../dom/HTMLBRElement.idl
+../dom/HTMLCollection.idl
+../dom/HTMLDivElement.idl
+../dom/HTMLElement.idl
+../dom/HTMLHeadElement.idl
+../dom/HTMLHeadingElement.idl
+../dom/HTMLHtmlElement.idl
+../dom/HTMLImageElement.idl
+../dom/HTMLLinkElement.idl
+../dom/HTMLMediaElement.idl
+../dom/HTMLMetaElement.idl
+../dom/HTMLParagraphElement.idl
+../dom/HTMLScriptElement.idl
+../dom/HTMLSpanElement.idl
+../dom/HTMLStyleElement.idl
+../dom/HTMLTitleElement.idl
+../dom/HTMLUnknownElement.idl
+../dom/HTMLVideoElement.idl
+../dom/KeyboardEvent.idl
+../dom/Location.idl
+../dom/MediaError.idl
+../dom/MediaKeyCompleteEvent.idl
+../dom/MediaKeyError.idl
+../dom/MediaKeyErrorEvent.idl
+../dom/MediaKeyMessageEvent.idl
+../dom/MediaKeyNeededEvent.idl
+../dom/MediaQueryList.idl
+../dom/MediaSource.idl
+../dom/MimeTypeArray.idl
+../dom/NamedNodeMap.idl
+../dom/Navigator.idl
+../dom/Node.idl
+../dom/NodeList.idl
+../dom/Performance.idl
+../dom/PerformanceTiming.idl
+../dom/PluginArray.idl
+../dom/ProgressEvent.idl
+../dom/Screen.idl
+../dom/SecurityPolicyViolationEvent.idl
+../dom/SourceBuffer.idl
+../dom/SourceBufferList.idl
+../dom/Storage.idl
+../dom/StorageEvent.idl
+../dom/TestRunner.idl
+../dom/Text.idl
+../dom/TimeRanges.idl
+../dom/TransitionEvent.idl
+../dom/UIEvent.idl
+../dom/Uint16Array.idl
+../dom/Uint32Array.idl
+../dom/Uint8Array.idl
+../dom/URL.idl
+../dom/VideoPlaybackQuality.idl
+../dom/Window.idl
+../dom/XMLDocument.idl
+../dom/XMLSerializer.idl
+../h5vcc/dial/DialHttpRequest.idl
+../h5vcc/dial/DialHttpResponse.idl
+../h5vcc/dial/DialServer.idl
+../h5vcc/H5vcc.idl
+../h5vcc/H5vccAccountInfo.idl
+../h5vcc/H5vccAccountManager.idl
+../h5vcc/H5vccAudioConfig.idl
+../h5vcc/H5vccAudioConfigArray.idl
+../h5vcc/H5vccCVal.idl
+../h5vcc/H5vccCValKeyList.idl
+../h5vcc/H5vccDeepLinkEventTarget.idl
+../h5vcc/H5vccRuntime.idl
+../h5vcc/H5vccRuntimeEventTarget.idl
+../h5vcc/H5vccSettings.idl
+../h5vcc/H5vccStorage.idl
+../h5vcc/H5vccSystem.idl
+../speech/SpeechRecognition.idl
+../speech/SpeechRecognitionAlternative.idl
+../speech/SpeechRecognitionError.idl
+../speech/SpeechRecognitionEvent.idl
+../speech/SpeechRecognitionResult.idl
+../speech/SpeechRecognitionResultList.idl
+../web_animations/Animatable.idl
+../web_animations/Animation.idl
+../web_animations/AnimationEffectReadOnly.idl
+../web_animations/AnimationEffectTimingReadOnly.idl
+../web_animations/AnimationTimeline.idl
+../web_animations/Keyframe.idl
+../web_animations/KeyframeEffectReadOnly.idl
+../webdriver/ScriptExecutor.idl
+../xhr/XMLHttpRequest.idl
+../xhr/XMLHttpRequestEventTarget.idl
+../xhr/XMLHttpRequestUpload.idl
diff --git a/src/cobalt/browser/global_objects_idl_files_list.tmp b/src/cobalt/browser/global_objects_idl_files_list.tmp
new file mode 100644
index 0000000..7c539ab
--- /dev/null
+++ b/src/cobalt/browser/global_objects_idl_files_list.tmp
@@ -0,0 +1,144 @@
+../audio/AudioBuffer.idl
+../audio/AudioBufferSourceNode.idl
+../audio/AudioContext.idl
+../audio/AudioDestinationNode.idl
+../audio/AudioNode.idl
+../cssom/CSSConditionRule.idl
+../cssom/CSSGroupingRule.idl
+../cssom/CSSFontFaceRule.idl
+../cssom/CSSMediaRule.idl
+../cssom/CSSKeyframeRule.idl
+../cssom/CSSKeyframesRule.idl
+../cssom/CSSRule.idl
+../cssom/CSSRuleList.idl
+../cssom/CSSStyleDeclaration.idl
+../cssom/CSSStyleRule.idl
+../cssom/CSSStyleSheet.idl
+../cssom/MediaList.idl
+../cssom/StyleSheet.idl
+../cssom/StyleSheetList.idl
+../debug/DebugHub.idl
+../debug/Debugger.idl
+../debug/DebuggerEventTarget.idl
+../debug/DebugScriptRunner.idl
+../dom/AnimationEvent.idl
+../dom/ArrayBuffer.idl
+../dom/ArrayBufferView.idl
+../dom/Attr.idl
+../dom/Blob.idl
+../dom/CDATASection.idl
+../dom/CharacterData.idl
+../dom/Comment.idl
+../dom/Console.idl
+../dom/Crypto.idl
+../dom/DataView.idl
+../dom/Document.idl
+../dom/DocumentTimeline.idl
+../dom/DocumentType.idl
+../dom/DOMException.idl
+../dom/DOMImplementation.idl
+../dom/DOMParser.idl
+../dom/DOMRect.idl
+../dom/DOMRectList.idl
+../dom/DOMRectReadOnly.idl
+../dom/DOMStringMap.idl
+../dom/DOMTokenList.idl
+../dom/Element.idl
+../dom/Event.idl
+../dom/EventListener.idl
+../dom/EventTarget.idl
+../dom/Float32Array.idl
+../dom/Float64Array.idl
+../dom/FocusEvent.idl
+../dom/History.idl
+../dom/HTMLAnchorElement.idl
+../dom/HTMLBodyElement.idl
+../dom/HTMLBRElement.idl
+../dom/HTMLCollection.idl
+../dom/HTMLDivElement.idl
+../dom/HTMLElement.idl
+../dom/HTMLHeadElement.idl
+../dom/HTMLHeadingElement.idl
+../dom/HTMLHtmlElement.idl
+../dom/HTMLImageElement.idl
+../dom/HTMLLinkElement.idl
+../dom/HTMLMediaElement.idl
+../dom/HTMLMetaElement.idl
+../dom/HTMLParagraphElement.idl
+../dom/HTMLScriptElement.idl
+../dom/HTMLSpanElement.idl
+../dom/HTMLStyleElement.idl
+../dom/HTMLTitleElement.idl
+../dom/HTMLUnknownElement.idl
+../dom/HTMLVideoElement.idl
+../dom/KeyboardEvent.idl
+../dom/Location.idl
+../dom/MediaError.idl
+../dom/MediaKeyCompleteEvent.idl
+../dom/MediaKeyError.idl
+../dom/MediaKeyErrorEvent.idl
+../dom/MediaKeyMessageEvent.idl
+../dom/MediaKeyNeededEvent.idl
+../dom/MediaQueryList.idl
+../dom/MediaSource.idl
+../dom/MimeTypeArray.idl
+../dom/NamedNodeMap.idl
+../dom/Navigator.idl
+../dom/Node.idl
+../dom/NodeList.idl
+../dom/Performance.idl
+../dom/PerformanceTiming.idl
+../dom/PluginArray.idl
+../dom/ProgressEvent.idl
+../dom/Screen.idl
+../dom/SecurityPolicyViolationEvent.idl
+../dom/SourceBuffer.idl
+../dom/SourceBufferList.idl
+../dom/Storage.idl
+../dom/StorageEvent.idl
+../dom/TestRunner.idl
+../dom/Text.idl
+../dom/TimeRanges.idl
+../dom/TransitionEvent.idl
+../dom/UIEvent.idl
+../dom/Uint16Array.idl
+../dom/Uint32Array.idl
+../dom/Uint8Array.idl
+../dom/URL.idl
+../dom/VideoPlaybackQuality.idl
+../dom/Window.idl
+../dom/XMLDocument.idl
+../dom/XMLSerializer.idl
+../h5vcc/dial/DialHttpRequest.idl
+../h5vcc/dial/DialHttpResponse.idl
+../h5vcc/dial/DialServer.idl
+../h5vcc/H5vcc.idl
+../h5vcc/H5vccAccountInfo.idl
+../h5vcc/H5vccAccountManager.idl
+../h5vcc/H5vccAudioConfig.idl
+../h5vcc/H5vccAudioConfigArray.idl
+../h5vcc/H5vccCVal.idl
+../h5vcc/H5vccCValKeyList.idl
+../h5vcc/H5vccDeepLinkEventTarget.idl
+../h5vcc/H5vccRuntime.idl
+../h5vcc/H5vccRuntimeEventTarget.idl
+../h5vcc/H5vccSettings.idl
+../h5vcc/H5vccStorage.idl
+../h5vcc/H5vccSystem.idl
+../speech/SpeechRecognition.idl
+../speech/SpeechRecognitionAlternative.idl
+../speech/SpeechRecognitionError.idl
+../speech/SpeechRecognitionEvent.idl
+../speech/SpeechRecognitionResult.idl
+../speech/SpeechRecognitionResultList.idl
+../web_animations/Animatable.idl
+../web_animations/Animation.idl
+../web_animations/AnimationEffectReadOnly.idl
+../web_animations/AnimationEffectTimingReadOnly.idl
+../web_animations/AnimationTimeline.idl
+../web_animations/Keyframe.idl
+../web_animations/KeyframeEffectReadOnly.idl
+../webdriver/ScriptExecutor.idl
+../xhr/XMLHttpRequest.idl
+../xhr/XMLHttpRequestEventTarget.idl
+../xhr/XMLHttpRequestUpload.idl
diff --git a/src/cobalt/browser/interfaces_info_individual_static_idl_files_list.tmp b/src/cobalt/browser/interfaces_info_individual_static_idl_files_list.tmp
new file mode 100644
index 0000000..216f4b4
--- /dev/null
+++ b/src/cobalt/browser/interfaces_info_individual_static_idl_files_list.tmp
@@ -0,0 +1,171 @@
+../audio/AudioBuffer.idl
+../audio/AudioBufferSourceNode.idl
+../audio/AudioContext.idl
+../audio/AudioDestinationNode.idl
+../audio/AudioNode.idl
+../cssom/CSSConditionRule.idl
+../cssom/CSSGroupingRule.idl
+../cssom/CSSFontFaceRule.idl
+../cssom/CSSMediaRule.idl
+../cssom/CSSKeyframeRule.idl
+../cssom/CSSKeyframesRule.idl
+../cssom/CSSRule.idl
+../cssom/CSSRuleList.idl
+../cssom/CSSStyleDeclaration.idl
+../cssom/CSSStyleRule.idl
+../cssom/CSSStyleSheet.idl
+../cssom/MediaList.idl
+../cssom/StyleSheet.idl
+../cssom/StyleSheetList.idl
+../debug/DebugHub.idl
+../debug/Debugger.idl
+../debug/DebuggerEventTarget.idl
+../debug/DebugScriptRunner.idl
+../dom/AnimationEvent.idl
+../dom/ArrayBuffer.idl
+../dom/ArrayBufferView.idl
+../dom/Attr.idl
+../dom/Blob.idl
+../dom/CDATASection.idl
+../dom/CharacterData.idl
+../dom/Comment.idl
+../dom/Console.idl
+../dom/Crypto.idl
+../dom/DataView.idl
+../dom/Document.idl
+../dom/DocumentTimeline.idl
+../dom/DocumentType.idl
+../dom/DOMException.idl
+../dom/DOMImplementation.idl
+../dom/DOMParser.idl
+../dom/DOMRect.idl
+../dom/DOMRectList.idl
+../dom/DOMRectReadOnly.idl
+../dom/DOMStringMap.idl
+../dom/DOMTokenList.idl
+../dom/Element.idl
+../dom/Event.idl
+../dom/EventListener.idl
+../dom/EventTarget.idl
+../dom/Float32Array.idl
+../dom/Float64Array.idl
+../dom/FocusEvent.idl
+../dom/History.idl
+../dom/HTMLAnchorElement.idl
+../dom/HTMLBodyElement.idl
+../dom/HTMLBRElement.idl
+../dom/HTMLCollection.idl
+../dom/HTMLDivElement.idl
+../dom/HTMLElement.idl
+../dom/HTMLHeadElement.idl
+../dom/HTMLHeadingElement.idl
+../dom/HTMLHtmlElement.idl
+../dom/HTMLImageElement.idl
+../dom/HTMLLinkElement.idl
+../dom/HTMLMediaElement.idl
+../dom/HTMLMetaElement.idl
+../dom/HTMLParagraphElement.idl
+../dom/HTMLScriptElement.idl
+../dom/HTMLSpanElement.idl
+../dom/HTMLStyleElement.idl
+../dom/HTMLTitleElement.idl
+../dom/HTMLUnknownElement.idl
+../dom/HTMLVideoElement.idl
+../dom/KeyboardEvent.idl
+../dom/Location.idl
+../dom/MediaError.idl
+../dom/MediaKeyCompleteEvent.idl
+../dom/MediaKeyError.idl
+../dom/MediaKeyErrorEvent.idl
+../dom/MediaKeyMessageEvent.idl
+../dom/MediaKeyNeededEvent.idl
+../dom/MediaQueryList.idl
+../dom/MediaSource.idl
+../dom/MimeTypeArray.idl
+../dom/NamedNodeMap.idl
+../dom/Navigator.idl
+../dom/Node.idl
+../dom/NodeList.idl
+../dom/Performance.idl
+../dom/PerformanceTiming.idl
+../dom/PluginArray.idl
+../dom/ProgressEvent.idl
+../dom/Screen.idl
+../dom/SecurityPolicyViolationEvent.idl
+../dom/SourceBuffer.idl
+../dom/SourceBufferList.idl
+../dom/Storage.idl
+../dom/StorageEvent.idl
+../dom/TestRunner.idl
+../dom/Text.idl
+../dom/TimeRanges.idl
+../dom/TransitionEvent.idl
+../dom/UIEvent.idl
+../dom/Uint16Array.idl
+../dom/Uint32Array.idl
+../dom/Uint8Array.idl
+../dom/URL.idl
+../dom/VideoPlaybackQuality.idl
+../dom/Window.idl
+../dom/XMLDocument.idl
+../dom/XMLSerializer.idl
+../h5vcc/dial/DialHttpRequest.idl
+../h5vcc/dial/DialHttpResponse.idl
+../h5vcc/dial/DialServer.idl
+../h5vcc/H5vcc.idl
+../h5vcc/H5vccAccountInfo.idl
+../h5vcc/H5vccAccountManager.idl
+../h5vcc/H5vccAudioConfig.idl
+../h5vcc/H5vccAudioConfigArray.idl
+../h5vcc/H5vccCVal.idl
+../h5vcc/H5vccCValKeyList.idl
+../h5vcc/H5vccDeepLinkEventTarget.idl
+../h5vcc/H5vccRuntime.idl
+../h5vcc/H5vccRuntimeEventTarget.idl
+../h5vcc/H5vccSettings.idl
+../h5vcc/H5vccStorage.idl
+../h5vcc/H5vccSystem.idl
+../speech/SpeechRecognition.idl
+../speech/SpeechRecognitionAlternative.idl
+../speech/SpeechRecognitionError.idl
+../speech/SpeechRecognitionEvent.idl
+../speech/SpeechRecognitionResult.idl
+../speech/SpeechRecognitionResultList.idl
+../web_animations/Animatable.idl
+../web_animations/Animation.idl
+../web_animations/AnimationEffectReadOnly.idl
+../web_animations/AnimationEffectTimingReadOnly.idl
+../web_animations/AnimationTimeline.idl
+../web_animations/Keyframe.idl
+../web_animations/KeyframeEffectReadOnly.idl
+../webdriver/ScriptExecutor.idl
+../xhr/XMLHttpRequest.idl
+../xhr/XMLHttpRequestEventTarget.idl
+../xhr/XMLHttpRequestUpload.idl
+../cssom/LinkStyle.idl
+../dom/Document_CSSOM.idl
+../dom/Document_HTML5.idl
+../dom/Document_WebAnimationsAPI.idl
+../dom/Element_CSSOMView.idl
+../dom/Element_DOMParsingAndSerialization.idl
+../dom/ElementCSSInlineStyle.idl
+../dom/GlobalCrypto.idl
+../dom/GlobalEventHandlers.idl
+../dom/HTMLElement_CSSOMView.idl
+../dom/NavigatorID.idl
+../dom/NavigatorLanguage.idl
+../dom/NavigatorPlugins.idl
+../dom/NavigatorStorageUtils.idl
+../dom/NonDocumentTypeChildNode.idl
+../dom/NonElementParentNode.idl
+../dom/ParentNode.idl
+../dom/Performance_HighResolutionTime.idl
+../dom/URLUtils.idl
+../dom/Window_AnimationTiming.idl
+../dom/Window_CSSOM.idl
+../dom/Window_CSSOMView.idl
+../dom/Window_Performance.idl
+../dom/WindowEventHandlers.idl
+../dom/WindowLocalStorage.idl
+../dom/WindowSessionStorage.idl
+../dom/WindowTimers.idl
diff --git a/src/cobalt/build/build.id b/src/cobalt/build/build.id
index eb49ee4..f895aef 100644
--- a/src/cobalt/build/build.id
+++ b/src/cobalt/build/build.id
@@ -1 +1 @@
-11337
\ No newline at end of file
+11333
\ No newline at end of file
diff --git a/src/cobalt/version.h b/src/cobalt/version.h
index 7c390aa..aa9b2a5 100644
--- a/src/cobalt/version.h
+++ b/src/cobalt/version.h
@@ -17,6 +17,6 @@
 #define COBALT_VERSION_H_
 
 // Cobalt release number.
-#define COBALT_VERSION "3"
+#define COBALT_VERSION "4"
 
 #endif  // COBALT_VERSION_H_
diff --git a/src/cobalt/xhr/xml_http_request.cc b/src/cobalt/xhr/xml_http_request.cc
index d1877a9..e514ed2 100644
--- a/src/cobalt/xhr/xml_http_request.cc
+++ b/src/cobalt/xhr/xml_http_request.cc
@@ -21,6 +21,7 @@
 #include "base/compiler_specific.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
+#include "base/time.h"
 #include "cobalt/base/polymorphic_downcast.h"
 #include "cobalt/base/source_location.h"
 #include "cobalt/base/tokens.h"
@@ -361,13 +362,13 @@
   StartRequest(request_body_text);
 
   // Start the timeout timer running, if applicable.
-  send_start_time_ = base::Time::Now();
+  send_start_time_ = base::TimeTicks::Now();
   if (timeout_ms_) {
     StartTimer(base::TimeDelta());
   }
   // Timer for throttling progress events.
-  upload_last_progress_time_ = base::Time();
-  last_progress_time_ = base::Time();
+  upload_last_progress_time_ = base::TimeTicks();
+  last_progress_time_ = base::TimeTicks();
 }
 
 base::optional<std::string> XMLHttpRequest::GetResponseHeader(
@@ -531,7 +532,7 @@
   } else if (sent_) {
     // Timeout was set while request was in flight. Timeout is relative to
     // the start of the request.
-    StartTimer(base::Time::Now() - send_start_time_);
+    StartTimer(base::TimeTicks::Now() - send_start_time_);
   }
 }
 
@@ -614,7 +615,7 @@
   ChangeState(kLoading);
 
   // Send a progress notification if at least 50ms have elapsed.
-  const base::Time now = base::Time::Now();
+  const base::TimeTicks now = base::TimeTicks::Now();
   const base::TimeDelta elapsed(now - last_progress_time_);
   if (elapsed > base::TimeDelta::FromMilliseconds(kProgressPeriodMs)) {
     last_progress_time_ = now;
@@ -657,7 +658,7 @@
 
   // Fire a progress event if either the upload just completed, or if enough
   // time has elapsed since we sent the last one.
-  const base::Time now = base::Time::Now();
+  const base::TimeTicks now = base::TimeTicks::Now();
   const base::TimeDelta elapsed(now - upload_last_progress_time_);
   if (upload_complete_ ||
       (elapsed > base::TimeDelta::FromMilliseconds(kProgressPeriodMs))) {
@@ -702,6 +703,7 @@
       << ") " << *this << std::endl
       << script::StackTraceToString(
              settings_->global_environment()->GetStackTrace());
+  stop_timeout_ = true;
   // Step 1
   TerminateRequest();
   // Steps 2-4
@@ -735,9 +737,13 @@
   // Subtract any time that has already elapsed from the timeout.
   // This is in case the user has set a timeout after send() was already in
   // flight.
-  timer_.Start(FROM_HERE,
-               base::TimeDelta::FromMilliseconds(timeout_ms_) - time_since_send,
-               this, &XMLHttpRequest::OnTimeout);
+  base::TimeDelta delay = std::max(
+      base::TimeDelta(),
+      base::TimeDelta::FromMilliseconds(timeout_ms_) - time_since_send);
+
+  // Queue the callback even if delay ends up being zero, to preserve the
+  // previous semantics.
+  timer_.Start(FROM_HERE, delay, this, &XMLHttpRequest::OnTimeout);
 }
 
 void XMLHttpRequest::ChangeState(XMLHttpRequest::State new_state) {
diff --git a/src/cobalt/xhr/xml_http_request.h b/src/cobalt/xhr/xml_http_request.h
index d3f5aa6..83d2d7f 100644
--- a/src/cobalt/xhr/xml_http_request.h
+++ b/src/cobalt/xhr/xml_http_request.h
@@ -241,11 +241,11 @@
 
   // For handling send() timeout.
   base::OneShotTimer<XMLHttpRequest> timer_;
-  base::Time send_start_time_;
+  base::TimeTicks send_start_time_;
 
   // Time to throttle progress notifications.
-  base::Time last_progress_time_;
-  base::Time upload_last_progress_time_;
+  base::TimeTicks last_progress_time_;
+  base::TimeTicks upload_last_progress_time_;
 
   // All members requiring initialization are grouped below.
   dom::DOMSettings* settings_;
diff --git a/src/starboard/shared/ffmpeg/ffmpeg_video_decoder.cc b/src/starboard/shared/ffmpeg/ffmpeg_video_decoder.cc
index 5bf56cd..9010e37 100644
--- a/src/starboard/shared/ffmpeg/ffmpeg_video_decoder.cc
+++ b/src/starboard/shared/ffmpeg/ffmpeg_video_decoder.cc
@@ -142,8 +142,6 @@
 }
 
 void VideoDecoder::Reset() {
-  SB_DCHECK(host_ != NULL);
-
   // Join the thread to ensure that all callbacks in process are finished.
   if (SbThreadIsValid(decoder_thread_)) {
     queue_.Put(Event(kReset));
diff --git a/src/third_party/zlib/README.chromium b/src/third_party/zlib/README.chromium
index 81d20ef..2b17d42 100644
--- a/src/third_party/zlib/README.chromium
+++ b/src/third_party/zlib/README.chromium
@@ -15,6 +15,7 @@
 - Added 'int z_errno' global for WinCE, to which 'errno' is defined in zutil.h.
 - Added 'mozzconf.h' to mangle the function names.
 - Added an #ifdef to prevent zlib.h from mangling its functions.
+- Changed DEBUG macro to ZLIB_DEBUG in order to not conflict with other libraries.
 The 'google.patch' file represents our changes from the original zlib-1.2.5.
 
 A more significant change to support mixed-source data compression. See
diff --git a/src/third_party/zlib/deflate.c b/src/third_party/zlib/deflate.c
index 8043e5b..121df9b 100644
--- a/src/third_party/zlib/deflate.c
+++ b/src/third_party/zlib/deflate.c
@@ -93,7 +93,7 @@
 local uInt longest_match  OF((deflate_state *s, IPos cur_match, int clas));
 #endif
 
-#ifdef DEBUG
+#ifdef ZLIB_DEBUG
 local  void check_match OF((deflate_state *s, IPos start, IPos match,
                             int length));
 #endif
@@ -1407,7 +1407,7 @@
 
 #endif /* FASTEST */
 
-#ifdef DEBUG
+#ifdef ZLIB_DEBUG
 /* ===========================================================================
  * Check that the match at match_start is indeed a match.
  */
diff --git a/src/third_party/zlib/deflate.h b/src/third_party/zlib/deflate.h
index 2fe6fd6..e62114c 100644
--- a/src/third_party/zlib/deflate.h
+++ b/src/third_party/zlib/deflate.h
@@ -251,7 +251,7 @@
     uInt matches;       /* number of string matches in current block */
     int last_eob_len;   /* bit length of EOB code for last block */
 
-#ifdef DEBUG
+#ifdef ZLIB_DEBUG
     ulg compressed_len; /* total bit length of compressed file mod 2^32 */
     ulg bits_sent;      /* bit length of compressed data sent mod 2^32 */
 #endif
diff --git a/src/third_party/zlib/trees.c b/src/third_party/zlib/trees.c
index 56e9bb1..ce53468 100644
--- a/src/third_party/zlib/trees.c
+++ b/src/third_party/zlib/trees.c
@@ -36,7 +36,7 @@
 
 #include "deflate.h"
 
-#ifdef DEBUG
+#ifdef ZLIB_DEBUG
 #  include <ctype.h>
 #endif
 
@@ -187,7 +187,7 @@
  * Send a value on a given number of bits.
  * IN assertion: length <= 16 and value fits in length bits.
  */
-#ifdef DEBUG
+#ifdef ZLIB_DEBUG
 local void send_bits      OF((deflate_state *s, int value, int length));
 
 local void send_bits(s, value, length)
@@ -400,7 +400,7 @@
     s->bi_buf = 0;
     s->bi_valid = 0;
     s->last_eob_len = 8; /* enough lookahead for inflate */
-#ifdef DEBUG
+#ifdef ZLIB_DEBUG
     s->compressed_len = 0L;
     s->bits_sent = 0L;
 #endif
@@ -875,7 +875,7 @@
     int last;         /* one if this is the last block for a file */
 {
     send_bits(s, (STORED_BLOCK<<1)+last, 3);    /* send block type */
-#ifdef DEBUG
+#ifdef ZLIB_DEBUG
     s->compressed_len = (s->compressed_len + 3 + 7) & (ulg)~7L;
     s->compressed_len += (stored_len + 4) << 3;
 #endif
@@ -898,7 +898,7 @@
 {
     send_bits(s, STATIC_TREES<<1, 3);
     send_code(s, END_BLOCK, static_ltree);
-#ifdef DEBUG
+#ifdef ZLIB_DEBUG
     s->compressed_len += 10L; /* 3 for block type, 7 for EOB */
 #endif
     bi_flush(s);
@@ -910,7 +910,7 @@
     if (1 + s->last_eob_len + 10 - s->bi_valid < 9) {
         send_bits(s, STATIC_TREES<<1, 3);
         send_code(s, END_BLOCK, static_ltree);
-#ifdef DEBUG
+#ifdef ZLIB_DEBUG
         s->compressed_len += 10L;
 #endif
         bi_flush(s);
@@ -991,7 +991,7 @@
 #endif
         send_bits(s, (STATIC_TREES<<1)+last, 3);
         compress_block(s, (ct_data *)static_ltree, (ct_data *)static_dtree);
-#ifdef DEBUG
+#ifdef ZLIB_DEBUG
         s->compressed_len += 3 + s->static_len;
 #endif
     } else {
@@ -999,7 +999,7 @@
         send_all_trees(s, s->l_desc.max_code+1, s->d_desc.max_code+1,
                        max_blindex+1);
         compress_block(s, (ct_data *)s->dyn_ltree, (ct_data *)s->dyn_dtree);
-#ifdef DEBUG
+#ifdef ZLIB_DEBUG
         s->compressed_len += 3 + s->opt_len;
 #endif
     }
@@ -1011,7 +1011,7 @@
 
     if (last) {
         bi_windup(s);
-#ifdef DEBUG
+#ifdef ZLIB_DEBUG
         s->compressed_len += 7;  /* align on byte boundary */
 #endif
     }
@@ -1210,7 +1210,7 @@
     }
     s->bi_buf = 0;
     s->bi_valid = 0;
-#ifdef DEBUG
+#ifdef ZLIB_DEBUG
     s->bits_sent = (s->bits_sent+7) & ~7;
 #endif
 }
@@ -1231,11 +1231,11 @@
     if (header) {
         put_short(s, (ush)len);
         put_short(s, (ush)~len);
-#ifdef DEBUG
+#ifdef ZLIB_DEBUG
         s->bits_sent += 2*16;
 #endif
     }
-#ifdef DEBUG
+#ifdef ZLIB_DEBUG
     s->bits_sent += (ulg)len<<3;
 #endif
     while (len--) {
diff --git a/src/third_party/zlib/zconf.h b/src/third_party/zlib/zconf.h
index c991fc1..54a13bb 100644
--- a/src/third_party/zlib/zconf.h
+++ b/src/third_party/zlib/zconf.h
@@ -435,7 +435,7 @@
 #  define NO_ERRNO_H
 /* zlib pulls in a lot more dependencies in DEBUG mode. So, for now, zlib
  * debugging is disabled in STARBOARD. */
-#  undef DEBUG
+#  undef ZLIB_DEBUG
 #endif
 
 /* MVS linker does not support external names larger than 8 bytes */
diff --git a/src/third_party/zlib/zutil.c b/src/third_party/zlib/zutil.c
index f49a470..bf2e3cc 100644
--- a/src/third_party/zlib/zutil.c
+++ b/src/third_party/zlib/zutil.c
@@ -58,7 +58,7 @@
     case 8:     flags += 2 << 6;        break;
     default:    flags += 3 << 6;
     }
-#ifdef DEBUG
+#ifdef ZLIB_DEBUG
     flags += 1 << 8;
 #endif
 #if defined(ASMV) || defined(ASMINF)
@@ -112,7 +112,7 @@
     return flags;
 }
 
-#ifdef DEBUG
+#ifdef ZLIB_DEBUG
 
 #  ifndef verbose
 #    define verbose 0