Revert of SK_DECLARE_STATIC_MUTEX -> static SkMutex

src/fonts/SkTestScalerContext.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 "SkAdvancedTypefaceMetrics.h"
 #include "SkBitmap.h"
 #include "SkCanvas.h"
@@ skipping 25 matching lines @@
 SkTestFont::~SkTestFont() {
     for (unsigned index = 0; index < fCharCodesCount; ++index) {
         delete fPaths[index];
     }
     delete[] fPaths;
 }
 
 #ifdef SK_DEBUG
 
 #include "SkMutex.h"
-static SkMutex gUsedCharsMutex;
+SK_DECLARE_STATIC_MUTEX(gUsedCharsMutex);
 
 #endif
 
 int SkTestFont::codeToIndex(SkUnichar charCode) const {
 #ifdef SK_DEBUG  // detect missing test font data
     {
         SkAutoMutexAcquire ac(gUsedCharsMutex);
         if (charCode >= ' ' && charCode <= '~') {
             int bitOffset = charCode - ' ';
             fDebugBits[bitOffset >> 3] |= 1 << (bitOffset & 7);
@@ skipping 224 matching lines @@
 
 private:
     SkTestTypeface*  fFace;
     SkMatrix         fMatrix;
 };
 
 SkScalerContext* SkTestTypeface::onCreateScalerContext(const SkScalerContextEffects& effects,
                                                        const SkDescriptor* desc) const {
     return new SkTestScalerContext(const_cast<SkTestTypeface*>(this), effects, desc);
 }