Clean up SkOnce:

include/core/SkInstCnt.h

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #ifndef SkInstCnt_DEFINED
 #define SkInstCnt_DEFINED
@@ skipping 29 matching lines @@
 // The root classes registers a function to print out the memory stats when
 // the app ends
 #define SK_DECLARE_INST_COUNT_ROOT(className)                               \
     SK_DECLARE_INST_COUNT_INTERNAL(className, atexit(exitPrint);)
 
 #define SK_DECLARE_INST_COUNT_INTERNAL(className, initStep)                 \
     class SkInstanceCountHelper {                                           \
     public:                                                                 \
         SkInstanceCountHelper() {                                           \
             SK_DECLARE_STATIC_ONCE(once);                                   \
-            SkOnce(&once, init, 0);                                         \
+            SkOnce(&once, init);                                            \
             sk_atomic_inc(GetInstanceCountPtr());                           \
         }                                                                   \
                                                                             \
-        static void init(int) {                                             \
+        static void init() {                                                \
             initStep                                                        \
         }                                                                   \
                                                                             \
         SkInstanceCountHelper(const SkInstanceCountHelper&) {               \
             sk_atomic_inc(GetInstanceCountPtr());                           \
         }                                                                   \
                                                                             \
         ~SkInstanceCountHelper() {                                          \
             sk_atomic_dec(GetInstanceCountPtr());                           \
         }                                                                   \
@@ skipping 68 matching lines @@
 #define SK_DECLARE_INST_COUNT(className) static void AddInstChild() { INHERITED::AddInstChild(); }
 #define SK_DECLARE_INST_COUNT_ROOT(className) static void AddInstChild() { }
 #endif
 
 // Following are deprecated. They are defined only for backwards API compatibility.
 #define SK_DECLARE_INST_COUNT_TEMPLATE(className) SK_DECLARE_INST_COUNT(className)
 #define SK_DEFINE_INST_COUNT(className)
 #define SK_DEFINE_INST_COUNT_TEMPLATE(templateInfo, className)
 
 #endif // SkInstCnt_DEFINED