Eliminate some clutter in SkFlattenable

include/core/SkFlattenable.h

Index: include/core/SkFlattenable.h
diff --git a/include/core/SkFlattenable.h b/include/core/SkFlattenable.h
index 66a84f3d29e549097a0d43cd557cf9c4ce7783be..bccabc18fa86d9cdf22babca2ea2f280157d2f72 100644
--- a/include/core/SkFlattenable.h
+++ b/include/core/SkFlattenable.h
@@ -43,8 +43,8 @@ class SkPrivateEffectInitializer;
     }
 
 #define SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(flattenable) \
-    SkFlattenable::Registrar(#flattenable, flattenable::CreateProc, \
-                             flattenable::GetFlattenableType());
+    SkFlattenable::Register(#flattenable, flattenable::CreateProc, \
+                            flattenable::GetFlattenableType());
 
 #define SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(flattenable)    \
     private:                                                                \
@@ -102,13 +102,6 @@ public:
 
     static void Register(const char name[], Factory, Type);
 
-    class Registrar {
-    public:
-        Registrar(const char name[], Factory factory, Type type) {
-            SkFlattenable::Register(name, factory, type);
-        }
-    };
-
     /**
      *  Override this if your subclass needs to record data that it will need to recreate itself
      *  from its CreateProc (returned by getFactory()).