Refactor: clean up some unused or mostly-unused API I saw here.

tests/Test.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"
 
 #include "SkString.h"
@@ skipping 13 matching lines @@
 using namespace skiatest;
 
 Reporter::Reporter() : fTestCount(0) {
 }
 
 void Reporter::startTest(Test* test) {
     this->bumpTestCount();
     this->onStart(test);
 }
 
-void Reporter::report(const char desc[], Result result) {
-    this->onReport(desc ? desc : "<no description>", result);
+void Reporter::reportFailed(const SkString& desc) {
+    this->onReportFailed(desc);
 }
 
 void Reporter::endTest(Test* test) {
     this->onEnd(test);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 Test::Test() : fReporter(NULL), fPassed(true) {}
 
@@ skipping 11 matching lines @@
     }
     return fName.c_str();
 }
 
 namespace {
     class LocalReporter : public Reporter {
     public:
         explicit LocalReporter(Reporter* reporterToMimic) : fReporter(reporterToMimic) {}
 
         int failure_size() const { return fFailures.count(); }
-        const char* failure(int i) const { return fFailures[i].c_str(); }
+        const SkString& failure(int i) const { return fFailures[i]; }
 
     protected:
-        void onReport(const char desc[], Result result) SK_OVERRIDE {
-            if (kFailed == result) {
-                fFailures.push_back().set(desc);
-            }
+        void onReportFailed(const SkString& desc) SK_OVERRIDE {
+            fFailures.push_back(desc);
         }
 
         // Proxy down to fReporter.  We assume these calls are threadsafe.
         virtual bool allowExtendedTest() const SK_OVERRIDE {
             return fReporter->allowExtendedTest();
         }
 
         virtual bool allowThreaded() const SK_OVERRIDE {
             return fReporter->allowThreaded();
         }
@@ skipping 19 matching lines @@
     const SkMSec start = SkTime::GetMSecs();
     // Run the test into a LocalReporter so we know if it's passed or failed without interference
     // from other tests that might share fReporter.
     LocalReporter local(fReporter);
     this->onRun(&local);
     fPassed = local.failure_size() == 0;
     fElapsed = SkTime::GetMSecs() - start;
 
     // Now tell fReporter about any failures and wrap up.
     for (int i = 0; i < local.failure_size(); i++) {
-      fReporter->report(local.failure(i), Reporter::kFailed);
+      fReporter->reportFailed(local.failure(i));
     }
     fReporter->endTest(this);
 
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 #if SK_SUPPORT_GPU
 #include "GrContextFactory.h"
 GrContextFactory gGrContextFactory;
 #endif
 
 GrContextFactory* GpuTest::GetGrContextFactory() {
 #if SK_SUPPORT_GPU
     return &gGrContextFactory;
 #else
     return NULL;
 #endif
 }
 
 void GpuTest::DestroyContexts() {
 #if SK_SUPPORT_GPU
     gGrContextFactory.destroyContexts();
 #endif
 }