Simplify SkInstCnt

tests/GrMemoryPoolTest.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "Test.h"
 // This is a GPU-backend specific test
 #if SK_SUPPORT_GPU
@@ skipping 26 matching lines @@
     }
 
     void operator delete(void* p) {
         if (!gPool.get()) {
             ::operator delete(p);
         } else {
             return gPool->release(p);
         }
     }
 
-    SK_DECLARE_INST_COUNT_ROOT(A);
+    SK_DECLARE_INST_COUNT(A);
 
     static A* Create(SkRandom* r);
 
     static void SetAllocator(size_t preallocSize, size_t minAllocSize) {
 #if SK_ENABLE_INST_COUNT
         SkASSERT(0 == GetInstanceCount());
 #endif
         GrMemoryPool* pool = new GrMemoryPool(preallocSize, minAllocSize);
         gPool.reset(pool);
     }
@@ skipping 175 matching lines @@
                 delete rec.fInstance;
             }
 #if SK_ENABLE_INST_COUNT
             REPORTER_ASSERT(reporter, !A::GetInstanceCount());
 #endif
         }
     }
 }
 
 #endif