ASSERT -> {DCHECK|DCHECK_XX}, ENABLE(ASSERT) -> DCHECK_IS_ON() in dom

third_party/WebKit/Source/core/dom/ChildFrameDisconnector.cpp

Index: third_party/WebKit/Source/core/dom/ChildFrameDisconnector.cpp
diff --git a/third_party/WebKit/Source/core/dom/ChildFrameDisconnector.cpp b/third_party/WebKit/Source/core/dom/ChildFrameDisconnector.cpp
index 9a7ec21970a50f39843ab243eb1a98f5757b2686..5f6c923798d5838525982b9c5b16f15354185a01 100644
--- a/third_party/WebKit/Source/core/dom/ChildFrameDisconnector.cpp
+++ b/third_party/WebKit/Source/core/dom/ChildFrameDisconnector.cpp
@@ -11,13 +11,13 @@
 
 namespace blink {
 
-#if ENABLE(ASSERT)
+#if DCHECK_IS_ON()
 static unsigned checkConnectedSubframeCountIsConsistent(Node&);
 #endif
 
 void ChildFrameDisconnector::disconnect(DisconnectPolicy policy)
 {
-#if ENABLE(ASSERT)
+#if DCHECK_IS_ON()
     checkConnectedSubframeCountIsConsistent(root());
 #endif
 
@@ -71,7 +71,7 @@ void ChildFrameDisconnector::collectFrameOwners(ElementShadow& shadow)
         collectFrameOwners(*root);
 }
 
-#if ENABLE(ASSERT)
+#if DCHECK_IS_ON()
 static unsigned checkConnectedSubframeCountIsConsistent(Node& node)
 {
     unsigned count = 0;
@@ -91,12 +91,12 @@ static unsigned checkConnectedSubframeCountIsConsistent(Node& node)
 
     // If we undercount there's possibly a security bug since we'd leave frames
     // in subtrees outside the document.
-    ASSERT(node.connectedSubframeCount() >= count);
+    DCHECK_GE(node.connectedSubframeCount(), count);
 
     // If we overcount it's safe, but not optimal because it means we'll traverse
     // through the document in ChildFrameDisconnector looking for frames that have
     // already been disconnected.
-    ASSERT(node.connectedSubframeCount() == count);
+    DCHECK_EQ(node.connectedSubframeCount(), count);
 
     return count;
 }