Revert of SK_DECLARE_STATIC_MUTEX -> static SkMutex

src/ports/SkFontConfigInterface_direct.cpp

 /*
  * Copyright 2009-2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 /* migrated from chrome/src/skia/ext/SkFontHost_fontconfig_direct.cpp */
 
 #include "SkBuffer.h"
@@ skipping 14 matching lines @@
 #include <unistd.h>
 
 #ifdef SK_DEBUG
 #    include "SkTLS.h"
 #endif
 
 namespace {
 
 // Fontconfig is not threadsafe before 2.10.91. Before that, we lock with a global mutex.
 // See https://bug.skia.org/1497 for background.
-static SkMutex gFCMutex;
+SK_DECLARE_STATIC_MUTEX(gFCMutex);
 
 #ifdef SK_DEBUG
 void* CreateThreadFcLocked() { return new bool(false); }
 void DeleteThreadFcLocked(void* v) { delete static_cast<bool*>(v); }
 #   define THREAD_FC_LOCKED \
         static_cast<bool*>(SkTLS::Get(CreateThreadFcLocked, DeleteThreadFcLocked))
 #endif
 
 struct FCLocker {
     // Assume FcGetVersion() has always been thread safe.
@@ skipping 680 matching lines @@
         const char* famName = get_name(match, FC_FAMILY);
         if (famName && !find_name(names, famName)) {
             *names.append() = famName;
             *sizes.append() = strlen(famName) + 1;
         }
     }
 
     return SkDataTable::NewCopyArrays((const void*const*)names.begin(),
                                       sizes.begin(), names.count());
 }