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

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

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/dom/ChildFrameDisconnector.h"
 
 #include "core/dom/shadow/ElementShadow.h"
 #include "core/dom/shadow/ShadowRoot.h"
 #include "core/html/HTMLFrameOwnerElement.h"
 #include "wtf/Assertions.h"
 
 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
 
     if (!root().connectedSubframeCount())
         return;
 
     if (policy == RootAndDescendants) {
         collectFrameOwners(root());
     } else {
         for (Node* child = root().firstChild(); child; child = child->nextSibling())
@@ skipping 33 matching lines @@
             owner->disconnectContentFrame();
     }
 }
 
 void ChildFrameDisconnector::collectFrameOwners(ElementShadow& shadow)
 {
     for (ShadowRoot* root = &shadow.youngestShadowRoot(); root; root = root->olderShadowRoot())
         collectFrameOwners(*root);
 }
 
-#if ENABLE(ASSERT)
+#if DCHECK_IS_ON()
 static unsigned checkConnectedSubframeCountIsConsistent(Node& node)
 {
     unsigned count = 0;
 
     if (node.isElementNode()) {
         if (node.isFrameOwnerElement() && toHTMLFrameOwnerElement(node).contentFrame())
             count++;
 
         if (ElementShadow* shadow = toElement(node).shadow()) {
             for (ShadowRoot* root = &shadow->youngestShadowRoot(); root; root = root->olderShadowRoot())
                 count += checkConnectedSubframeCountIsConsistent(*root);
         }
     }
 
     for (Node* child = node.firstChild(); child; child = child->nextSibling())
         count += checkConnectedSubframeCountIsConsistent(*child);
 
     // 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;
 }
 #endif
 
 } // namespace blink