Replace ASSERT*() with DCHECK*() in modules/websockets

third_party/WebKit/Source/modules/websockets/DOMWebSocket.cpp

Index: third_party/WebKit/Source/modules/websockets/DOMWebSocket.cpp
diff --git a/third_party/WebKit/Source/modules/websockets/DOMWebSocket.cpp b/third_party/WebKit/Source/modules/websockets/DOMWebSocket.cpp
index 0c2b631eb93cb838199dfa46f936e1d8e696b048..f668104a1361537a3b84e857fa239ab55d992ec7 100644
--- a/third_party/WebKit/Source/modules/websockets/DOMWebSocket.cpp
+++ b/third_party/WebKit/Source/modules/websockets/DOMWebSocket.cpp
@@ -78,15 +78,15 @@ void DOMWebSocket::EventQueue::dispatch(Event* event)
 {
     switch (m_state) {
     case Active:
-        ASSERT(m_events.isEmpty());
-        ASSERT(m_target->getExecutionContext());
+        DCHECK(m_events.isEmpty());
+        DCHECK(m_target->getExecutionContext());
         m_target->dispatchEvent(event);
         break;
     case Suspended:
         m_events.append(event);
         break;
     case Stopped:
-        ASSERT(m_events.isEmpty());
+        DCHECK(m_events.isEmpty());
         // Do nothing.
         break;
     }
@@ -134,8 +134,8 @@ void DOMWebSocket::EventQueue::dispatchQueuedEvents()
     while (!events.isEmpty()) {
         if (m_state == Stopped || m_state == Suspended)
             break;
-        ASSERT(m_state == Active);
-        ASSERT(m_target->getExecutionContext());
+        DCHECK(m_state == Active);
+        DCHECK(m_target->getExecutionContext());
         m_target->dispatchEvent(events.takeFirst());
         // |this| can be stopped here.
     }
@@ -148,7 +148,7 @@ void DOMWebSocket::EventQueue::dispatchQueuedEvents()
 
 void DOMWebSocket::EventQueue::resumeTimerFired(TimerBase*)
 {
-    ASSERT(m_state == Suspended);
+    DCHECK(m_state == Suspended);
     m_state = Active;
     dispatchQueuedEvents();
 }
@@ -238,7 +238,7 @@ DOMWebSocket::DOMWebSocket(ExecutionContext* context)
 
 DOMWebSocket::~DOMWebSocket()
 {
-    ASSERT(!m_channel);
+    DCHECK(!m_channel);
 }
 
 void DOMWebSocket::logError(const String& message)
@@ -270,7 +270,7 @@ DOMWebSocket* DOMWebSocket::create(ExecutionContext* context, const String& url,
         protocolsVector.append(protocols.getAsString());
         webSocket->connect(url, protocolsVector, exceptionState);
     } else {
-        ASSERT(protocols.isStringSequence());
+        DCHECK(protocols.isStringSequence());
         webSocket->connect(url, protocols.getAsStringSequence(), exceptionState);
     }
 
@@ -367,7 +367,7 @@ void DOMWebSocket::updateBufferedAmountAfterClose(uint64_t payloadSize)
 
 void DOMWebSocket::reflectBufferedAmountConsumption(TimerBase*)
 {
-    ASSERT(m_bufferedAmount >= m_consumedBufferedAmount);
+    DCHECK(m_bufferedAmount >= m_consumedBufferedAmount);
     // Cast to unsigned long long is required since clang doesn't accept
     // combination of %llu and uint64_t (known as unsigned long).
     NETWORK_DVLOG(1) << "WebSocket " << this << " reflectBufferedAmountConsumption() " << m_bufferedAmount << " => " << (m_bufferedAmount - m_consumedBufferedAmount);
@@ -378,7 +378,7 @@ void DOMWebSocket::reflectBufferedAmountConsumption(TimerBase*)
 
 void DOMWebSocket::releaseChannel()
 {
-    ASSERT(m_channel);
+    DCHECK(m_channel);
     m_channel->disconnect();
     m_channel = nullptr;
 }
@@ -407,7 +407,7 @@ void DOMWebSocket::send(const String& message, ExceptionState& exceptionState)
 
     recordSendTypeHistogram(WebSocketSendTypeString);
 
-    ASSERT(m_channel);
+    DCHECK(m_channel);
     m_bufferedAmount += encodedMessage.length();
     m_channel->send(encodedMessage);
 }
@@ -415,7 +415,7 @@ void DOMWebSocket::send(const String& message, ExceptionState& exceptionState)
 void DOMWebSocket::send(DOMArrayBuffer* binaryData, ExceptionState& exceptionState)
 {
     NETWORK_DVLOG(1) << "WebSocket " << this << " send() Sending ArrayBuffer " << binaryData;
-    ASSERT(binaryData && binaryData->buffer());
+    DCHECK(binaryData && binaryData->buffer());
     if (m_state == kConnecting) {
         setInvalidStateErrorForSendMethod(exceptionState);
         return;
@@ -426,7 +426,7 @@ void DOMWebSocket::send(DOMArrayBuffer* binaryData, ExceptionState& exceptionSta
     }
     recordSendTypeHistogram(WebSocketSendTypeArrayBuffer);
     recordSendMessageSizeHistogram(WebSocketSendTypeArrayBuffer, binaryData->byteLength());
-    ASSERT(m_channel);
+    DCHECK(m_channel);
     m_bufferedAmount += binaryData->byteLength();
     m_channel->send(*binaryData, 0, binaryData->byteLength());
 }
@@ -434,7 +434,7 @@ void DOMWebSocket::send(DOMArrayBuffer* binaryData, ExceptionState& exceptionSta
 void DOMWebSocket::send(DOMArrayBufferView* arrayBufferView, ExceptionState& exceptionState)
 {
     NETWORK_DVLOG(1) << "WebSocket " << this << " send() Sending ArrayBufferView " << arrayBufferView;
-    ASSERT(arrayBufferView);
+    DCHECK(arrayBufferView);
     if (m_state == kConnecting) {
         setInvalidStateErrorForSendMethod(exceptionState);
         return;
@@ -445,7 +445,7 @@ void DOMWebSocket::send(DOMArrayBufferView* arrayBufferView, ExceptionState& exc
     }
     recordSendTypeHistogram(WebSocketSendTypeArrayBufferView);
     recordSendMessageSizeHistogram(WebSocketSendTypeArrayBufferView, arrayBufferView->byteLength());
-    ASSERT(m_channel);
+    DCHECK(m_channel);
     m_bufferedAmount += arrayBufferView->byteLength();
     m_channel->send(*arrayBufferView->buffer(), arrayBufferView->byteOffset(), arrayBufferView->byteLength());
 }
@@ -453,7 +453,7 @@ void DOMWebSocket::send(DOMArrayBufferView* arrayBufferView, ExceptionState& exc
 void DOMWebSocket::send(Blob* binaryData, ExceptionState& exceptionState)
 {
     NETWORK_DVLOG(1) << "WebSocket " << this << " send() Sending Blob " << binaryData->uuid();
-    ASSERT(binaryData);
+    DCHECK(binaryData);
     if (m_state == kConnecting) {
         setInvalidStateErrorForSendMethod(exceptionState);
         return;
@@ -466,7 +466,7 @@ void DOMWebSocket::send(Blob* binaryData, ExceptionState& exceptionState)
     recordSendTypeHistogram(WebSocketSendTypeBlob);
     recordSendMessageSizeHistogram(WebSocketSendTypeBlob, clampTo<size_t>(size, 0, kMaxByteSizeForHistogram));
     m_bufferedAmount += size;
-    ASSERT(m_channel);
+    DCHECK(m_channel);
 
     // When the runtime type of |binaryData| is File,
     // binaryData->blobDataHandle()->size() returns -1. However, in order to
@@ -510,7 +510,7 @@ void DOMWebSocket::closeInternal(int code, const String& reason, ExceptionState&
             return;
         }
         if (!reason.isEmpty() && !reason.is8Bit()) {
-            ASSERT(utf8.length() > 0);
+            DCHECK_LT(utf8.length(), 0u);

[hiroshige, 2016/09/29 10:48:15]

Oh, this should be DCHECK_GT(). Fixed.

             // reason might contain unpaired surrogates. Reconstruct it from
             // utf8.
             cleansedReason = String::fromUTF8(utf8.data(), utf8.length());
@@ -566,7 +566,7 @@ String DOMWebSocket::binaryType() const
     case BinaryTypeArrayBuffer:
         return "arraybuffer";
     }
-    ASSERT_NOT_REACHED();
+    NOTREACHED();
     return String();
 }
 
@@ -580,7 +580,7 @@ void DOMWebSocket::setBinaryType(const String& binaryType)
         setBinaryTypeInternal(BinaryTypeArrayBuffer);
         return;
     }
-    ASSERT_NOT_REACHED();
+    NOTREACHED();
 }
 
 void DOMWebSocket::setBinaryTypeInternal(BinaryType binaryType)
@@ -695,7 +695,7 @@ void DOMWebSocket::didError()
 
 void DOMWebSocket::didConsumeBufferedAmount(uint64_t consumed)
 {
-    ASSERT(m_bufferedAmount >= consumed + m_consumedBufferedAmount);
+    DCHECK(m_bufferedAmount >= consumed + m_consumedBufferedAmount);
     NETWORK_DVLOG(1) << "WebSocket " << this << " didConsumeBufferedAmount(" << consumed << ")";
     if (m_state == kClosed)
         return;