Migrate SkRTConfRegistry test to DEF_TEST().

include/utils/SkRTConf.h

 /*
  * Copyright 2013 Google, Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #ifndef SkRTConf_DEFINED
 #define SkRTConf_DEFINED
@@ skipping 55 matching lines @@
 #endif
 
 /** \class SkRTConfRegistry
     A class that maintains a systemwide registry of all runtime configuration
     parameters.  Mainly used for printing them out and handling multiply-defined
     knobs.
 */
 
 class SkRTConfRegistry {
 public:
     SkRTConfRegistry();

[mtklein, 2014/08/07 12:26:14]

SK_SUPPORT_UNITTEST is not defined anywhere.  This is the constructor you're
calling.

[tfarina, 2014/08/07 14:11:27]

Done.

     ~SkRTConfRegistry();
     void printAll(const char *fname = NULL) const;
     bool hasNonDefault() const;
     void printNonDefault(const char *fname = NULL) const;
     const char *configFileLocation() const;
     void possiblyDumpFile() const;
     void validate() const;
     template <typename T> void set(const char *confname,
                                    T value,
                                    bool warnIfNotFound = true);
-#ifdef SK_SUPPORT_UNITTEST
-    static void UnitTest();
-#endif
+    template <typename T> bool parse(const char *name, T* value);

[tfarina, 2014/08/07 03:05:40]

I know you won't like this ;/

[mtklein, 2014/08/07 12:26:14]

Seems fine, but let's keep it private and instead friend it to a proxy in the
test file?

[tfarina, 2014/08/07 14:11:27]

Hum, who do I do that?

+
 private:
     template<typename T> friend class SkRTConf;
 
+#ifdef SK_SUPPORT_UNITTEST
+    SkRTConfRegistry();

[tfarina, 2014/08/07 03:05:40]

you will probably want me to keep the bool parameter, won't you?

[mtklein, 2014/08/07 12:26:14]

I don't think so?   If this test works as written, it'd be better to delete this
alternative constructor entirely.  It's not being called.

[tfarina, 2014/08/07 14:11:27]

Done.

+#endif
+
     void registerConf(SkRTConfBase *conf);
-    template <typename T> bool parse(const char *name, T* value);
 
     SkTDArray<SkString *> fConfigFileKeys, fConfigFileValues;
     typedef SkTDict< SkTDArray<SkRTConfBase *> * > ConfMap;
     ConfMap fConfs;
-#ifdef SK_SUPPORT_UNITTEST
-    SkRTConfRegistry(bool);
-#endif
 };
 
 // our singleton registry
 
 SkRTConfRegistry &skRTConfRegistry();
 
 template<typename T>
 SkRTConf<T>::SkRTConf(const char *name, const T &defaultValue, const char *description)
     : SkRTConfBase(name)
     , fValue(defaultValue)
@@ skipping 74 matching lines @@
     // static_cast here is okay because there's only one kind of child class.
     const SkRTConf<T> *child_pointer = static_cast<const SkRTConf<T> *>(conf);
     return child_pointer &&
            fName == child_pointer->fName &&
            fDescription == child_pointer->fDescription &&
            fValue == child_pointer->fValue &&
            fDefault == child_pointer->fDefault;
 }
 
 #endif