| Index: third_party/WebKit/Source/bindings/tests/results/core/StringOrArrayBufferOrArrayBufferView.cpp
 | 
| diff --git a/third_party/WebKit/Source/bindings/tests/results/core/StringOrArrayBufferOrArrayBufferView.cpp b/third_party/WebKit/Source/bindings/tests/results/core/StringOrArrayBufferOrArrayBufferView.cpp
 | 
| index 0fc7f81f3a35c8592312b3f64943b363a06bb126..d3597c4ddadcd08f2aef9ade4916683eb506ea14 100644
 | 
| --- a/third_party/WebKit/Source/bindings/tests/results/core/StringOrArrayBufferOrArrayBufferView.cpp
 | 
| +++ b/third_party/WebKit/Source/bindings/tests/results/core/StringOrArrayBufferOrArrayBufferView.cpp
 | 
| @@ -14,132 +14,116 @@
 | 
|  
 | 
|  namespace blink {
 | 
|  
 | 
| -StringOrArrayBufferOrArrayBufferView::StringOrArrayBufferOrArrayBufferView()
 | 
| -    : m_type(SpecificTypeNone)
 | 
| -{
 | 
| -}
 | 
| +StringOrArrayBufferOrArrayBufferView::StringOrArrayBufferOrArrayBufferView() : m_type(SpecificTypeNone) {}
 | 
|  
 | 
| -String StringOrArrayBufferOrArrayBufferView::getAsString() const
 | 
| -{
 | 
| -    ASSERT(isString());
 | 
| -    return m_string;
 | 
| +String StringOrArrayBufferOrArrayBufferView::getAsString() const {
 | 
| +  DCHECK(isString());
 | 
| +  return m_string;
 | 
|  }
 | 
|  
 | 
| -void StringOrArrayBufferOrArrayBufferView::setString(String value)
 | 
| -{
 | 
| -    ASSERT(isNull());
 | 
| -    m_string = value;
 | 
| -    m_type = SpecificTypeString;
 | 
| +void StringOrArrayBufferOrArrayBufferView::setString(String value) {
 | 
| +  DCHECK(isNull());
 | 
| +  m_string = value;
 | 
| +  m_type = SpecificTypeString;
 | 
|  }
 | 
|  
 | 
| -StringOrArrayBufferOrArrayBufferView StringOrArrayBufferOrArrayBufferView::fromString(String value)
 | 
| -{
 | 
| -    StringOrArrayBufferOrArrayBufferView container;
 | 
| -    container.setString(value);
 | 
| -    return container;
 | 
| +StringOrArrayBufferOrArrayBufferView StringOrArrayBufferOrArrayBufferView::fromString(String value) {
 | 
| +  StringOrArrayBufferOrArrayBufferView container;
 | 
| +  container.setString(value);
 | 
| +  return container;
 | 
|  }
 | 
|  
 | 
| -TestArrayBuffer* StringOrArrayBufferOrArrayBufferView::getAsArrayBuffer() const
 | 
| -{
 | 
| -    ASSERT(isArrayBuffer());
 | 
| -    return m_arrayBuffer;
 | 
| +TestArrayBuffer* StringOrArrayBufferOrArrayBufferView::getAsArrayBuffer() const {
 | 
| +  DCHECK(isArrayBuffer());
 | 
| +  return m_arrayBuffer;
 | 
|  }
 | 
|  
 | 
| -void StringOrArrayBufferOrArrayBufferView::setArrayBuffer(TestArrayBuffer* value)
 | 
| -{
 | 
| -    ASSERT(isNull());
 | 
| -    m_arrayBuffer = value;
 | 
| -    m_type = SpecificTypeArrayBuffer;
 | 
| +void StringOrArrayBufferOrArrayBufferView::setArrayBuffer(TestArrayBuffer* value) {
 | 
| +  DCHECK(isNull());
 | 
| +  m_arrayBuffer = value;
 | 
| +  m_type = SpecificTypeArrayBuffer;
 | 
|  }
 | 
|  
 | 
| -StringOrArrayBufferOrArrayBufferView StringOrArrayBufferOrArrayBufferView::fromArrayBuffer(TestArrayBuffer* value)
 | 
| -{
 | 
| -    StringOrArrayBufferOrArrayBufferView container;
 | 
| -    container.setArrayBuffer(value);
 | 
| -    return container;
 | 
| +StringOrArrayBufferOrArrayBufferView StringOrArrayBufferOrArrayBufferView::fromArrayBuffer(TestArrayBuffer* value) {
 | 
| +  StringOrArrayBufferOrArrayBufferView container;
 | 
| +  container.setArrayBuffer(value);
 | 
| +  return container;
 | 
|  }
 | 
|  
 | 
| -TestArrayBufferView* StringOrArrayBufferOrArrayBufferView::getAsArrayBufferView() const
 | 
| -{
 | 
| -    ASSERT(isArrayBufferView());
 | 
| -    return m_arrayBufferView;
 | 
| +TestArrayBufferView* StringOrArrayBufferOrArrayBufferView::getAsArrayBufferView() const {
 | 
| +  DCHECK(isArrayBufferView());
 | 
| +  return m_arrayBufferView;
 | 
|  }
 | 
|  
 | 
| -void StringOrArrayBufferOrArrayBufferView::setArrayBufferView(TestArrayBufferView* value)
 | 
| -{
 | 
| -    ASSERT(isNull());
 | 
| -    m_arrayBufferView = value;
 | 
| -    m_type = SpecificTypeArrayBufferView;
 | 
| +void StringOrArrayBufferOrArrayBufferView::setArrayBufferView(TestArrayBufferView* value) {
 | 
| +  DCHECK(isNull());
 | 
| +  m_arrayBufferView = value;
 | 
| +  m_type = SpecificTypeArrayBufferView;
 | 
|  }
 | 
|  
 | 
| -StringOrArrayBufferOrArrayBufferView StringOrArrayBufferOrArrayBufferView::fromArrayBufferView(TestArrayBufferView* value)
 | 
| -{
 | 
| -    StringOrArrayBufferOrArrayBufferView container;
 | 
| -    container.setArrayBufferView(value);
 | 
| -    return container;
 | 
| +StringOrArrayBufferOrArrayBufferView StringOrArrayBufferOrArrayBufferView::fromArrayBufferView(TestArrayBufferView* value) {
 | 
| +  StringOrArrayBufferOrArrayBufferView container;
 | 
| +  container.setArrayBufferView(value);
 | 
| +  return container;
 | 
|  }
 | 
|  
 | 
|  StringOrArrayBufferOrArrayBufferView::StringOrArrayBufferOrArrayBufferView(const StringOrArrayBufferOrArrayBufferView&) = default;
 | 
|  StringOrArrayBufferOrArrayBufferView::~StringOrArrayBufferOrArrayBufferView() = default;
 | 
|  StringOrArrayBufferOrArrayBufferView& StringOrArrayBufferOrArrayBufferView::operator=(const StringOrArrayBufferOrArrayBufferView&) = default;
 | 
|  
 | 
| -DEFINE_TRACE(StringOrArrayBufferOrArrayBufferView)
 | 
| -{
 | 
| -    visitor->trace(m_arrayBuffer);
 | 
| -    visitor->trace(m_arrayBufferView);
 | 
| +DEFINE_TRACE(StringOrArrayBufferOrArrayBufferView) {
 | 
| +  visitor->trace(m_arrayBuffer);
 | 
| +  visitor->trace(m_arrayBufferView);
 | 
|  }
 | 
|  
 | 
| -void V8StringOrArrayBufferOrArrayBufferView::toImpl(v8::Isolate* isolate, v8::Local<v8::Value> v8Value, StringOrArrayBufferOrArrayBufferView& impl, UnionTypeConversionMode conversionMode, ExceptionState& exceptionState)
 | 
| -{
 | 
| -    if (v8Value.IsEmpty())
 | 
| -        return;
 | 
| -
 | 
| -    if (conversionMode == UnionTypeConversionMode::Nullable && isUndefinedOrNull(v8Value))
 | 
| -        return;
 | 
| -
 | 
| -    if (v8Value->IsArrayBuffer()) {
 | 
| -        TestArrayBuffer* cppValue = V8ArrayBuffer::toImpl(v8::Local<v8::Object>::Cast(v8Value));
 | 
| -        impl.setArrayBuffer(cppValue);
 | 
| -        return;
 | 
| -    }
 | 
| -
 | 
| -    if (v8Value->IsArrayBufferView()) {
 | 
| -        TestArrayBufferView* cppValue = V8ArrayBufferView::toImpl(v8::Local<v8::Object>::Cast(v8Value));
 | 
| -        impl.setArrayBufferView(cppValue);
 | 
| -        return;
 | 
| -    }
 | 
| -
 | 
| -    {
 | 
| -        V8StringResource<> cppValue = v8Value;
 | 
| -        if (!cppValue.prepare(exceptionState))
 | 
| -            return;
 | 
| -        impl.setString(cppValue);
 | 
| -        return;
 | 
| -    }
 | 
| +void V8StringOrArrayBufferOrArrayBufferView::toImpl(v8::Isolate* isolate, v8::Local<v8::Value> v8Value, StringOrArrayBufferOrArrayBufferView& impl, UnionTypeConversionMode conversionMode, ExceptionState& exceptionState) {
 | 
| +  if (v8Value.IsEmpty())
 | 
| +    return;
 | 
| +
 | 
| +  if (conversionMode == UnionTypeConversionMode::Nullable && isUndefinedOrNull(v8Value))
 | 
| +    return;
 | 
| +
 | 
| +  if (v8Value->IsArrayBuffer()) {
 | 
| +    TestArrayBuffer* cppValue = V8ArrayBuffer::toImpl(v8::Local<v8::Object>::Cast(v8Value));
 | 
| +    impl.setArrayBuffer(cppValue);
 | 
| +    return;
 | 
| +  }
 | 
| +
 | 
| +  if (v8Value->IsArrayBufferView()) {
 | 
| +    TestArrayBufferView* cppValue = V8ArrayBufferView::toImpl(v8::Local<v8::Object>::Cast(v8Value));
 | 
| +    impl.setArrayBufferView(cppValue);
 | 
| +    return;
 | 
| +  }
 | 
| +
 | 
| +  {
 | 
| +    V8StringResource<> cppValue = v8Value;
 | 
| +    if (!cppValue.prepare(exceptionState))
 | 
| +      return;
 | 
| +    impl.setString(cppValue);
 | 
| +    return;
 | 
| +  }
 | 
|  }
 | 
|  
 | 
| -v8::Local<v8::Value> toV8(const StringOrArrayBufferOrArrayBufferView& impl, v8::Local<v8::Object> creationContext, v8::Isolate* isolate)
 | 
| -{
 | 
| -    switch (impl.m_type) {
 | 
| +v8::Local<v8::Value> toV8(const StringOrArrayBufferOrArrayBufferView& impl, v8::Local<v8::Object> creationContext, v8::Isolate* isolate) {
 | 
| +  switch (impl.m_type) {
 | 
|      case StringOrArrayBufferOrArrayBufferView::SpecificTypeNone:
 | 
| -        return v8::Null(isolate);
 | 
| +      return v8::Null(isolate);
 | 
|      case StringOrArrayBufferOrArrayBufferView::SpecificTypeString:
 | 
| -        return v8String(isolate, impl.getAsString());
 | 
| +      return v8String(isolate, impl.getAsString());
 | 
|      case StringOrArrayBufferOrArrayBufferView::SpecificTypeArrayBuffer:
 | 
| -        return toV8(impl.getAsArrayBuffer(), creationContext, isolate);
 | 
| +      return toV8(impl.getAsArrayBuffer(), creationContext, isolate);
 | 
|      case StringOrArrayBufferOrArrayBufferView::SpecificTypeArrayBufferView:
 | 
| -        return toV8(impl.getAsArrayBufferView(), creationContext, isolate);
 | 
| +      return toV8(impl.getAsArrayBufferView(), creationContext, isolate);
 | 
|      default:
 | 
| -        ASSERT_NOT_REACHED();
 | 
| -    }
 | 
| -    return v8::Local<v8::Value>();
 | 
| +      NOTREACHED();
 | 
| +  }
 | 
| +  return v8::Local<v8::Value>();
 | 
|  }
 | 
|  
 | 
| -StringOrArrayBufferOrArrayBufferView NativeValueTraits<StringOrArrayBufferOrArrayBufferView>::nativeValue(v8::Isolate* isolate, v8::Local<v8::Value> value, ExceptionState& exceptionState)
 | 
| -{
 | 
| -    StringOrArrayBufferOrArrayBufferView impl;
 | 
| -    V8StringOrArrayBufferOrArrayBufferView::toImpl(isolate, value, impl, UnionTypeConversionMode::NotNullable, exceptionState);
 | 
| -    return impl;
 | 
| +StringOrArrayBufferOrArrayBufferView NativeValueTraits<StringOrArrayBufferOrArrayBufferView>::nativeValue(v8::Isolate* isolate, v8::Local<v8::Value> value, ExceptionState& exceptionState) {
 | 
| +  StringOrArrayBufferOrArrayBufferView impl;
 | 
| +  V8StringOrArrayBufferOrArrayBufferView::toImpl(isolate, value, impl, UnionTypeConversionMode::NotNullable, exceptionState);
 | 
| +  return impl;
 | 
|  }
 | 
|  
 | 
| -} // namespace blink
 | 
| +}  // namespace blink
 | 
| 
 |