Enable interactive_ui_tests

app/tree_node_model.h

 // Copyright (c) 2006-2008 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.
 
 #ifndef APP_TREE_NODE_MODEL_H_
 #define APP_TREE_NODE_MODEL_H_
 
 #include <algorithm>
 #include <string>
 #include <vector>
@@ skipping 64 matching lines @@
       : title_(WideToUTF16(title)), parent_(NULL) {}
 #endif
   explicit TreeNode(const string16& title)
       : title_(title), parent_(NULL) {}
 
   virtual ~TreeNode() {
   }
 
   // Adds the specified child node.
   virtual void Add(int index, NodeType* child) {
-    DCHECK(child && index >= 0 && index <= GetChildCount());
+    DCHECK(child);
+    DCHECK_LE(0, index);
+    DCHECK_GE(GetChildCount(), index);
     // If the node has a parent, remove it from its parent.
     NodeType* node_parent = child->GetParent();
     if (node_parent)
       node_parent->Remove(node_parent->IndexOfChild(child));
     child->parent_ = static_cast<NodeType*>(this);
     children_->insert(children_->begin() + index, child);
   }
 
   // Removes the node by index. This does NOT delete the specified node, it is
   // up to the caller to delete it when done.
@@ skipping 27 matching lines @@
     }
     return count;
   }
 
   // Returns a child by index.
   NodeType* GetChild(int index) {
     DCHECK(index >= 0 && index < GetChildCount());
     return children_[index];
   }
   const NodeType* GetChild(int index) const {
-    DCHECK(index >= 0 && index < GetChildCount());
+    DCHECK_LE(0, index);
+    DCHECK_GT(GetChildCount(), index);
     return children_[index];
   }
 
   // Returns the parent.
   NodeType* GetParent() {
     return parent_;
   }
   const NodeType* GetParent() const {
     return parent_;
   }
@@ skipping 174 matching lines @@
  private:
   // The observers.
   ObserverList<TreeModelObserver> observer_list_;
   // The root.
   scoped_ptr<NodeType> root_;
 
   DISALLOW_COPY_AND_ASSIGN(TreeNodeModel);
 };
 
 #endif  // APP_TREE_NODE_MODEL_H_