Simplify SkInstCnt

tests/LListTest.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkRandom.h"
 #include "SkTInternalLList.h"
 #include "SkTLList.h"
 #include "Test.h"
 
 class ListElement {
 public:
     ListElement(int id) : fID(id) {
     }
     bool operator== (const ListElement& other) { return fID == other.fID; }
 
 #if SK_ENABLE_INST_COUNT
     // Make the instance count available publicly.
     static int InstanceCount() { return GetInstanceCount(); }
 #endif
 
     int fID;
 
 private:
-    SK_DECLARE_INST_COUNT_ROOT(ListElement);
+    SK_DECLARE_INST_COUNT(ListElement);
     SK_DECLARE_INTERNAL_LLIST_INTERFACE(ListElement);
 };
 
 static void check_list(const SkTInternalLList<ListElement>& list,
                        skiatest::Reporter* reporter,
                        bool empty,
                        int numElements,
                        bool in0, bool in1, bool in2, bool in3,
                        ListElement elements[4]) {
 
@@ skipping 269 matching lines @@
 #if SK_ENABLE_INST_COUNT
         SkASSERT(0 == ListElement::InstanceCount());
 #endif
     }
 }
 
 DEF_TEST(LList, reporter) {
     TestTInternalLList(reporter);
     TestTLList(reporter);
 }