remove non-static uses of SkOncePtr

tests/OncePtrTest.cpp

Index: tests/OncePtrTest.cpp
diff --git a/tests/OncePtrTest.cpp b/tests/OncePtrTest.cpp
index d01cee09fe913932de27ce52a017d25821b50582..0aacdf53ee3daec61ff7145ea5925916c6377266 100644
--- a/tests/OncePtrTest.cpp
+++ b/tests/OncePtrTest.cpp
@@ -9,9 +9,9 @@
 #include "SkOncePtr.h"
 #include "SkTaskGroup.h"
 
-DEF_TEST(OncePtr, r) {
-    SkOncePtr<int> once;
+SK_DECLARE_STATIC_ONCE_PTR(int, once);
 
+DEF_TEST(OncePtr, r) {
     static SkAtomic<int> calls(0);
     auto create = [&] {
         calls.fetch_add(1);
@@ -24,20 +24,3 @@ DEF_TEST(OncePtr, r) {
     });
     REPORTER_ASSERT(r, calls.load() == 1);
 }
-
-/* TODO(mtklein): next CL
-
-SK_DECLARE_STATIC_ONCE(once_noptr);
-DEF_TEST(OnceNoPtr, r) {
-    static SkAtomic<int> calls(0);
-
-    SkAtomic<int> force_a_race(sk_num_cores());
-    SkTaskGroup().batch(sk_num_cores()*4, [&](size_t) {
-        force_a_race.fetch_add(-1);
-        while (force_a_race.load() > 0);
-
-        SkOnce(&once_noptr, [&] { calls.fetch_add(1); });
-    });
-    REPORTER_ASSERT(r, calls.load() == 1);
-}
-*/