Rename SkFontConfigParser_android SkFontMgr_android_parser.

tests/FontMgrAndroidParserTest.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 "SkFontMgr_android_parser.h"
 #include "Test.h"
 
 #include <cmath>
 #include <cstdio>
 
 DECLARE_bool(verboseFontMgr);
 
 int CountFallbacks(SkTDArray<FontFamily*> fontFamilies) {
     int countOfFallbackFonts = 0;
     for (int i = 0; i < fontFamilies.count(); i++) {
@@ skipping 113 matching lines @@
     SkFixed fix;
     REPORTER_ASSERT(reporter, !parse_fixed<27>("-17.1", &fix));
     REPORTER_ASSERT(reporter, !parse_fixed<16>("32768", &fix));
     REPORTER_ASSERT(reporter, !parse_fixed<16>("", &fix));
     REPORTER_ASSERT(reporter, !parse_fixed<16>(".", &fix));
     REPORTER_ASSERT(reporter, !parse_fixed<16>("123.", &fix));
     REPORTER_ASSERT(reporter, !parse_fixed<16>("a", &fix));
     REPORTER_ASSERT(reporter, !parse_fixed<16>(".123a", &fix));
 }
 
-DEF_TEST(FontConfigParserAndroid, reporter) {
+DEF_TEST(FontMgrAndroidParser, reporter) {
     test_parse_fixed(reporter);
 
     bool resourcesMissing = false;
 
     SkTDArray<FontFamily*> preV17FontFamilies;
-    SkFontConfigParser::GetCustomFontFamilies(preV17FontFamilies,
+    SkFontMgr_Android_Parser::GetCustomFontFamilies(preV17FontFamilies,
         SkString("/custom/font/path/"),
         GetResourcePath("android_fonts/pre_v17/system_fonts.xml").c_str(),
         GetResourcePath("android_fonts/pre_v17/fallback_fonts.xml").c_str());
 
     if (preV17FontFamilies.count() > 0) {
         REPORTER_ASSERT(reporter, preV17FontFamilies.count() == 14);
         REPORTER_ASSERT(reporter, CountFallbacks(preV17FontFamilies) == 10);
 
         DumpLoadedFonts(preV17FontFamilies, "pre version 17");
         ValidateLoadedFonts(preV17FontFamilies, "Roboto-Regular.ttf", reporter);
     } else {
         resourcesMissing = true;
     }
 
 
     SkTDArray<FontFamily*> v17FontFamilies;
-    SkFontConfigParser::GetCustomFontFamilies(v17FontFamilies,
+    SkFontMgr_Android_Parser::GetCustomFontFamilies(v17FontFamilies,
         SkString("/custom/font/path/"),
         GetResourcePath("android_fonts/v17/system_fonts.xml").c_str(),
         GetResourcePath("android_fonts/v17/fallback_fonts.xml").c_str(),
         GetResourcePath("android_fonts/v17").c_str());
 
     if (v17FontFamilies.count() > 0) {
         REPORTER_ASSERT(reporter, v17FontFamilies.count() == 56);
         REPORTER_ASSERT(reporter, CountFallbacks(v17FontFamilies) == 46);
 
         DumpLoadedFonts(v17FontFamilies, "version 17");
         ValidateLoadedFonts(v17FontFamilies, "Roboto-Regular.ttf", reporter);
     } else {
         resourcesMissing = true;
     }
 
 
     SkTDArray<FontFamily*> v22FontFamilies;
-    SkFontConfigParser::GetCustomFontFamilies(v22FontFamilies,
+    SkFontMgr_Android_Parser::GetCustomFontFamilies(v22FontFamilies,
         SkString("/custom/font/path/"),
         GetResourcePath("android_fonts/v22/fonts.xml").c_str(),
         NULL);
 
     if (v22FontFamilies.count() > 0) {
         REPORTER_ASSERT(reporter, v22FontFamilies.count() == 54);
         REPORTER_ASSERT(reporter, CountFallbacks(v22FontFamilies) == 42);
 
         DumpLoadedFonts(v22FontFamilies, "version 22");
         ValidateLoadedFonts(v22FontFamilies, "Roboto-Thin.ttf", reporter);
     } else {
         resourcesMissing = true;
     }
 
     if (resourcesMissing) {
         SkDebugf("---- Resource files missing for FontConfigParser test\n");
     }
 }