Revert of SK_DECLARE_STATIC_MUTEX -> static SkMutex

dm/DMJsonWriter.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 "DMJsonWriter.h"
 
 #include "ProcStats.h"
 #include "SkCommonFlags.h"
 #include "SkData.h"
 #include "SkJSONCPP.h"
 #include "SkMutex.h"
 #include "SkOSFile.h"
 #include "SkStream.h"
 #include "SkTArray.h"
 
 namespace DM {
 
 SkTArray<JsonWriter::BitmapResult> gBitmapResults;
-static SkMutex gBitmapResultLock;
+SK_DECLARE_STATIC_MUTEX(gBitmapResultLock);
 
 void JsonWriter::AddBitmapResult(const BitmapResult& result) {
     SkAutoMutexAcquire lock(&gBitmapResultLock);
     gBitmapResults.push_back(result);
 }
 
 SkTArray<skiatest::Failure> gFailures;
-static SkMutex gFailureLock;
+SK_DECLARE_STATIC_MUTEX(gFailureLock);
 
 void JsonWriter::AddTestFailure(const skiatest::Failure& failure) {
     SkAutoMutexAcquire lock(gFailureLock);
     gFailures.push_back(failure);
 }
 
 void JsonWriter::DumpJson() {
     if (FLAGS_writePath.isEmpty()) {
         return;
     }
@@ skipping 79 matching lines @@
 
         if (!r["key"]["source_options"].isNull()) {
             br.sourceOptions = r["key"]["source_options"].asCString();
         }
         callback(br);
     }
     return true;
 }
 
 } // namespace DM