Revert of Remove SkThread.h, include SkMutex.h or SkAtomics.h as appropriate.

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 24 matching lines @@
 
 SkTestFont::~SkTestFont() {
     for (unsigned index = 0; index < fCharCodesCount; ++index) {
         SkDELETE(fPaths[index]);
     }
     SkDELETE_ARRAY(fPaths);
 }
 
 #ifdef SK_DEBUG
 
-#include "SkMutex.h"
+#include "SkThread.h"
 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 - ' ';
@@ skipping 229 matching lines @@
     }
 
 private:
     SkTestTypeface*  fFace;
     SkMatrix         fMatrix;
 };
 
 SkScalerContext* SkTestTypeface::onCreateScalerContext(const SkDescriptor* desc) const {
     return SkNEW_ARGS(SkTestScalerContext, (const_cast<SkTestTypeface*>(this), desc));
 }