Remove unnamed namespace usage from tests/

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 38 matching lines @@
     SkRefCnt_SafeAssign(fReporter, r);
 }
 
 const char* Test::getName() {
     if (fName.size() == 0) {
         this->onGetName(&fName);
     }
     return fName.c_str();
 }
 
-namespace {
-    class LocalReporter : public Reporter {
-    public:
-        explicit LocalReporter(Reporter* reporterToMimic) : fReporter(reporterToMimic) {}
+class LocalReporter : public Reporter {
+public:
+    explicit LocalReporter(Reporter* reporterToMimic) : fReporter(reporterToMimic) {}
 
-        int failure_size() const { return fFailures.count(); }
-        const SkString& failure(int i) const { return fFailures[i]; }
+    int failure_size() const { return fFailures.count(); }

[robertphillips, 2014/01/14 13:19:37]

failureSize? numFailures would probably be better though.

+    const SkString& failure(int i) const { return fFailures[i]; }
 
-    protected:
-        void onReportFailed(const SkString& desc) SK_OVERRIDE {
-            fFailures.push_back(desc);
-        }
+protected:

[robertphillips, 2014/01/14 13:19:37]

virtual?

+    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();
-        }
+    // 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();
-        }
+    virtual bool allowThreaded() const SK_OVERRIDE {
+        return fReporter->allowThreaded();
+    }
 
-        virtual void bumpTestCount() SK_OVERRIDE {
-            fReporter->bumpTestCount();
-        }
+    virtual void bumpTestCount() SK_OVERRIDE {
+        fReporter->bumpTestCount();
+    }
 
-        virtual bool verbose() const SK_OVERRIDE {
-            return fReporter->verbose();
-        }
+    virtual bool verbose() const SK_OVERRIDE {
+        return fReporter->verbose();
+    }
 
-    private:
-        Reporter* fReporter;  // Unowned.
-        SkTArray<SkString> fFailures;
-    };
-}  // namespace
+private:
+    Reporter* fReporter;  // Unowned.
+    SkTArray<SkString> fFailures;
+};
 
 void Test::run() {
     // Clear the Skia error callback before running any test, to ensure that tests
     // don't have unintended side effects when running more than one.
     SkSetErrorCallback( NULL, NULL );
 
     // Tell (likely shared) fReporter that this test has started.
     fReporter->startTest(this);
 
     const SkMSec start = SkTime::GetMSecs();
@@ skipping 25 matching lines @@
 #else
     return NULL;
 #endif
 }
 
 void GpuTest::DestroyContexts() {
 #if SK_SUPPORT_GPU
     gGrContextFactory.destroyContexts();
 #endif
 }