Revert of Port uses of SkLazyPtr to SkOncePtr.

src/core/SkData.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkData.h"
+#include "SkLazyPtr.h"
 #include "SkOSFile.h"
-#include "SkOncePtr.h"
 #include "SkReadBuffer.h"
 #include "SkStream.h"
 #include "SkWriteBuffer.h"
 
 SkData::SkData(const void* ptr, size_t size, ReleaseProc proc, void* context) {
     fPtr = const_cast<void*>(ptr);
     fSize = size;
     fReleaseProc = proc;
     fReleaseProcContext = context;
 }
@@ skipping 52 matching lines @@
     char* storage = (char*)sk_malloc_throw(actualLength);
     SkData* data = new (storage) SkData(length);
     if (srcOrNull) {
         memcpy(data->writable_data(), srcOrNull, length);
     }
     return data;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-SK_DECLARE_STATIC_ONCE_PTR(SkData, gEmpty);
+// As a template argument these must have external linkage.
+SkData* sk_new_empty_data() { return new SkData(nullptr, 0, nullptr, nullptr); }
+namespace { void sk_unref_data(SkData* ptr) { return SkSafeUnref(ptr); } }
+
+SK_DECLARE_STATIC_LAZY_PTR(SkData, empty, sk_new_empty_data, sk_unref_data);
+
 SkData* SkData::NewEmpty() {
-    return SkRef(gEmpty.get([]{return new SkData(nullptr, 0, nullptr, nullptr); }));
+    return SkRef(empty.get());
 }
 
 // assumes fPtr was allocated via sk_malloc
 static void sk_free_releaseproc(const void* ptr, void*) {
     sk_free((void*)ptr);
 }
 
 SkData* SkData::NewFromMalloc(const void* data, size_t length) {
     return new SkData(data, length, sk_free_releaseproc, nullptr);
 }
@@ skipping 89 matching lines @@
 ///////////////////////////////////////////////////////////////////////////////
 
 SkData* SkData::NewFromStream(SkStream* stream, size_t size) {
     SkAutoDataUnref data(SkData::NewUninitialized(size));
     if (stream->read(data->writable_data(), size) != size) {
         return nullptr;
     }
     return data.detach();
 }