Clean up SkOnce usage in SkFontMgr_Indirect.

include/ports/SkFontMgr_indirect.h

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkFontMgr_indirect_DEFINED
 #define SkFontMgr_indirect_DEFINED
 
 #include "SkDataTable.h"
 #include "SkFontMgr.h"
 #include "SkFontStyle.h"
 #include "SkOnce.h"
 #include "SkRemotableFontMgr.h"
 #include "SkTArray.h"
 #include "SkTypeface.h"
 
 class SkData;
 class SkStream;
 class SkString;
 class SkTypeface;
 
 class SK_API SkFontMgr_Indirect : public SkFontMgr {
 public:
     // TODO: The SkFontMgr is only used for createFromStream/File/Data.
     // In the future these calls should be broken out into their own interface
     // with a name like SkFontRenderer.
     SkFontMgr_Indirect(SkFontMgr* impl, SkRemotableFontMgr* proxy)
-        : fImpl(SkRef(impl)), fProxy(SkRef(proxy))
-    {
-        fOnce.done = false;
-        fOnce.lock.thisIsPrivate = 0;
-        SkDEBUGCODE(fOnce.lock.shouldBeZero = 0;)
-    }
+        : fImpl(SkRef(impl)), fProxy(SkRef(proxy)), fFamilyNamesInited(false)
+    { }
 
 protected:
     virtual int onCountFamilies() const SK_OVERRIDE;
     virtual void onGetFamilyName(int index, SkString* familyName) const SK_OVERRIDE;
     virtual SkFontStyleSet* onCreateStyleSet(int index) const SK_OVERRIDE;
 
     virtual SkFontStyleSet* onMatchFamily(const char familyName[]) const SK_OVERRIDE;
 
     virtual SkTypeface* onMatchFamilyStyle(const char familyName[],
                                            const SkFontStyle& fontStyle) const SK_OVERRIDE;
@@ skipping 46 matching lines @@
     /**
      *  This cache is essentially { dataId: { ttcIndex: typeface } }
      *  For data caching we want a mapping from data id to weak references to
      *  typefaces with that data id. By storing the index next to the typeface,
      *  this data cache also acts as a typeface cache.
      */
     mutable SkTArray<DataEntry> fDataCache;
     mutable SkMutex fDataCacheMutex;
 
     mutable SkAutoTUnref<SkDataTable> fFamilyNames;
-    mutable SkOnceFlag fOnce;
+    mutable bool fFamilyNamesInited;
+    mutable SkMutex fFamilyNamesMutex;
     static void set_up_family_names(const SkFontMgr_Indirect* self);
 
     friend class SkStyleSet_Indirect;
 };
 
 #endif