Clean up SkOnce usage in SkFontMgr_Indirect.

src/fonts/SkFontMgr_indirect.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 "SkFontMgr_indirect.h"
 
 #include "SkDataTable.h"
@@ skipping 137 matching lines @@
     SkAutoTUnref<const SkFontMgr_Indirect> fOwner;
     int fFamilyIndex;
     SkAutoTUnref<SkRemotableFontIdentitySet> fData;
 };
 
 void SkFontMgr_Indirect::set_up_family_names(const SkFontMgr_Indirect* self) {
     self->fFamilyNames.reset(self->fProxy->getFamilyNames());
 }
 
 int SkFontMgr_Indirect::onCountFamilies() const {
-    SkOnce(&fOnce, SkFontMgr_Indirect::set_up_family_names, this);
+    SkOnce(&fFamilyNamesInited, &fFamilyNamesMutex, SkFontMgr_Indirect::set_up_family_names, this);
     return fFamilyNames->count();
 }
 
 void SkFontMgr_Indirect::onGetFamilyName(int index, SkString* familyName) const {
-    SkOnce(&fOnce, SkFontMgr_Indirect::set_up_family_names, this);
+    SkOnce(&fFamilyNamesInited, &fFamilyNamesMutex, SkFontMgr_Indirect::set_up_family_names, this);
     if (index >= fFamilyNames->count()) {
         familyName->reset();
         return;
     }
     familyName->set(fFamilyNames->atStr(index));
 }
 
 SkFontStyleSet* SkFontMgr_Indirect::onCreateStyleSet(int index) const {
     SkRemotableFontIdentitySet* set = fProxy->getIndex(index);
     if (NULL == set) {
@@ skipping 114 matching lines @@
         face.reset(this->matchFamilyStyle(NULL, style));
     }
 
     if (NULL == face.get()) {
         SkFontIdentity fontId = this->fProxy->matchIndexStyle(0, style);
         face.reset(this->createTypefaceFromFontId(fontId));
     }
 
     return face.detach();
 }