Revert of SK_DECLARE_STATIC_MUTEX -> static SkMutex

tools/gpu/gl/command_buffer/GLTestContext_command_buffer.cpp

 
 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkMutex.h"
 #include "SkOnce.h"
@@ skipping 124 matching lines @@
 static const GrGLInterface* create_command_buffer_interface() {
     load_command_buffer_once();
     if (!gfFunctionsLoadedSuccessfully) {
         return nullptr;
     }
     return GrGLAssembleGLESInterface(gLibrary, command_buffer_get_gl_proc);
 }
 
 // We use a poor man's garbage collector of EGLDisplays. They are only
 // terminated when there are no more EGLDisplays in use. See crbug.com/603223
-static SkMutex gDisplayMutex;
+SK_DECLARE_STATIC_MUTEX(gDisplayMutex);
 static int gActiveDisplayCnt;
 SkTArray<EGLDisplay> gRetiredDisplays;
 
 static EGLDisplay get_and_init_display() {
     SkAutoMutexAcquire am(gDisplayMutex);
     EGLDisplay dsp = gfGetDisplay(EGL_DEFAULT_DISPLAY);
     if (dsp == EGL_NO_DISPLAY) {
         return EGL_NO_DISPLAY;
     }
     EGLint major, minor;
@@ skipping 208 matching lines @@
     return result;
 }
 
 int CommandBufferGLTestContext::getSampleCount() {
     EGLint result = 0;
     gfGetConfigAttrib(fDisplay, static_cast<EGLConfig>(fConfig), EGL_SAMPLES, &result);
     return result;
 }
 
 }  // namespace sk_gpu_test