Also proxy bumpTestCount.

tests/Test.h

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #ifndef skiatest_Test_DEFINED
 #define skiatest_Test_DEFINED
 
@@ skipping 14 matching lines @@
         SK_DECLARE_INST_COUNT(Reporter)
         Reporter();
 
         enum Result {
             kPassed,    // must begin with 0
             kFailed,
             /////
             kLastResult = kFailed
         };
 
-        void bumpTestCount() { sk_atomic_inc(&fTestCount); }
         int countTests() const { return fTestCount; }
 
         void startTest(Test*);
         void report(const char testDesc[], Result);
         void endTest(Test*);
+
         virtual bool allowExtendedTest() const { return false; }
         virtual bool allowThreaded() const { return false; }
+        virtual void bumpTestCount() { sk_atomic_inc(&fTestCount); }
+
         // helpers for tests
         void reportFailed(const char desc[]) {
             this->report(desc, kFailed);
         }
         void reportFailed(const SkString& desc) {
             this->report(desc.c_str(), kFailed);
         }
 
 
     protected:
@@ skipping 62 matching lines @@
     do {                                                                     \
         if (!(cond)) {                                                       \
             SkString desc;                                                   \
             desc.printf("%s %s:%d: %s", message, __FILE__, __LINE__, #cond); \
             r->reportFailed(desc);                                           \
         }                                                                    \
     } while(0)
 
 
 #endif