Revert of Fix race condition in parallel font initialization.

src/ports/SkFontConfigInterface_android.cpp

 
 /*
  * Copyright 2013 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkFontConfigInterface.h"
 #include "SkTypeface_android.h"
@@ skipping 137 matching lines @@
         }
 
         gFontConfigInterface = new SkFontConfigInterfaceAndroid(fontFamilies);
 
         // cleanup the data we received from the parser
         fontFamilies.deleteAll();
     }
     return gFontConfigInterface;
 }
 
-SkFontConfigInterface* SkFontConfigInterface::GetSingletonDirectInterface(SkBaseMutex*) {
-    // Doesn't need passed-in mutex because getSingletonInterface() uses one
+SkFontConfigInterface* SkFontConfigInterface::GetSingletonDirectInterface() {
     return getSingletonInterface();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 static bool has_font(const SkTArray<FontRec>& array, const SkString& filename) {
     for (int i = 0; i < array.count(); i++) {
         if (array[i].fFileName == filename) {
             return true;
         }
@@ skipping 737 matching lines @@
     return SkSafeRef(retTypeface);
 }
 
 #endif
 
 ///////////////////////////////////////////////////////////////////////////////
 
 SkFontMgr* SkFontMgr::Factory() {
     return NULL;
 }