Additional cleanups to Android config parsing.

tests/FontConfigParser.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 "Resources.h"
+#include "SkCommandLineFlags.h"
 #include "SkFontConfigParser_android.h"
 #include "Test.h"
 
+DECLARE_bool(verboseFontMgr);
+
 int CountFallbacks(SkTDArray<FontFamily*> fontFamilies) {
     int countOfFallbackFonts = 0;
     for (int i = 0; i < fontFamilies.count(); i++) {
         if (fontFamilies[i]->fIsFallbackFont) {
             countOfFallbackFonts++;
         }
     }
     return countOfFallbackFonts;
 }
 
 void ValidateLoadedFonts(SkTDArray<FontFamily*> fontFamilies, const char* firstExpectedFile,
                          skiatest::Reporter* reporter) {
     REPORTER_ASSERT(reporter, fontFamilies[0]->fNames.count() == 5);
     REPORTER_ASSERT(reporter, !strcmp(fontFamilies[0]->fNames[0].c_str(), "sans-serif"));
     REPORTER_ASSERT(reporter,
                     !strcmp(fontFamilies[0]->fFonts[0].fFileName.c_str(), firstExpectedFile));
     REPORTER_ASSERT(reporter, !fontFamilies[0]->fIsFallbackFont);
 }
 
 void DumpLoadedFonts(SkTDArray<FontFamily*> fontFamilies) {
-#if SK_DEBUG_FONTS
+    if (!FLAGS_verboseFontMgr) {
+        return;
+    }
+
     for (int i = 0; i < fontFamilies.count(); ++i) {
         SkDebugf("Family %d:\n", i);
         switch(fontFamilies[i]->fVariant) {
             case kElegant_FontVariant: SkDebugf("  elegant\n"); break;
             case kCompact_FontVariant: SkDebugf("  compact\n"); break;
             default: break;
         }
-        if (fontFamilies[i]->fBasePath) {
-            SkDebugf("  basePath %s\n", fontFamilies[i]->fBasePath);
-        }
+        SkDebugf("  basePath %s\n", fontFamilies[i]->fBasePath.c_str());
         if (!fontFamilies[i]->fLanguage.getTag().isEmpty()) {
             SkDebugf("  language %s\n", fontFamilies[i]->fLanguage.getTag().c_str());
         }
         for (int j = 0; j < fontFamilies[i]->fNames.count(); ++j) {
             SkDebugf("  name %s\n", fontFamilies[i]->fNames[j].c_str());
         }
         for (int j = 0; j < fontFamilies[i]->fFonts.count(); ++j) {
             const FontFileInfo& ffi = fontFamilies[i]->fFonts[j];
             SkDebugf("  file (%d) %s#%d\n", ffi.fWeight, ffi.fFileName.c_str(), ffi.fIndex);
         }
     }
-#endif // SK_DEBUG_FONTS
 }
 
 DEF_TEST(FontConfigParserAndroid, reporter) {
 
     bool resourcesMissing = false;
 
     SkTDArray<FontFamily*> preV17FontFamilies;
     SkFontConfigParser::GetCustomFontFamilies(preV17FontFamilies,
         SkString("/custom/font/path/"),
         GetResourcePath("android_fonts/pre_v17/system_fonts.xml").c_str(),
@@ skipping 41 matching lines @@
         ValidateLoadedFonts(v22FontFamilies, "Roboto-Thin.ttf", reporter);
     } else {
         resourcesMissing = true;
     }
 
     if (resourcesMissing) {
         SkDebugf("---- Resource files missing for FontConfigParser test\n");
     }
 }