Clean up SkOnce:

src/utils/SkEventTracer.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkEventTracer.h"
 #include "SkOnce.h"
 
@@ skipping 18 matching lines @@
         static uint8_t no = 0;
         return &no;
     };
     virtual const char* getCategoryGroupName(
       const uint8_t* categoryEnabledFlag) SK_OVERRIDE {
         static const char* dummy = "dummy";
         return dummy;
     };
 };
 
-SkEventTracer *SkEventTracer::gInstance;
-
-static void intialiize_default_tracer(void *current_instance) {
-    if (NULL == current_instance) {
-        SkEventTracer::SetInstance(SkNEW(SkDefaultEventTracer));
-    }
-}
+SkEventTracer* SkEventTracer::gInstance;
 
 static void cleanup_tracer() {
     // calling SetInstance will delete the existing instance.
     SkEventTracer::SetInstance(NULL);
 }
 
+static void intialize_default_tracer(SkEventTracer* current_instance) {
+    if (NULL == current_instance) {
+        SkEventTracer::SetInstance(SkNEW(SkDefaultEventTracer));
+    }
+    atexit(cleanup_tracer);
+}
+
+
 SkEventTracer* SkEventTracer::GetInstance() {
     SK_DECLARE_STATIC_ONCE(once);
-    SkOnce(&once,
-           intialiize_default_tracer,
-           SkEventTracer::gInstance,
-           cleanup_tracer);
+    SkOnce(&once, intialize_default_tracer, SkEventTracer::gInstance);
     SkASSERT(NULL != SkEventTracer::gInstance);
     return SkEventTracer::gInstance;
 }