Revert of Modifying TextBlobCacheTest to use SkRandomScalerContext

tests/TextBlobCacheTest.cpp

Index: tests/TextBlobCacheTest.cpp
diff --git a/tests/TextBlobCacheTest.cpp b/tests/TextBlobCacheTest.cpp
index c42ef89890755a720507118f2882b80d0cefff47..3cbc8a35ad8cd1d80d6fe595ed3aa0c3adeb4253 100644
--- a/tests/TextBlobCacheTest.cpp
+++ b/tests/TextBlobCacheTest.cpp
@@ -14,8 +14,6 @@
 #include "SkGraphics.h"
 #include "SkSurface.h"
 #include "SkTypeface.h"
-#include "../src/fonts/SkRandomScalerContext.h"
-#include "../src/fonts/SkGScalerContext.h"
 
 #ifdef SK_BUILD_FOR_WIN
     #include "SkTypeface_win.h"
@@ -61,8 +59,7 @@
     uint32_t flags = 0;
     SkSurfaceProps props(flags, SkSurfaceProps::kLegacyFontHost_InitType);
 
-    // We don't typically actually draw with this unittest
-    GrContext* ctx = factory->get(GrContextFactory::kNull_GLContextType);
+    GrContext* ctx = factory->get(GrContextFactory::kNative_GLContextType);
     SkImageInfo info = SkImageInfo::Make(kWidth, kHeight, kN32_SkColorType, kPremul_SkAlphaType);
     SkAutoTUnref<SkSurface> surface(SkSurface::NewRenderTarget(ctx, SkSurface::kNo_Budgeted, info,
                                                                0, &props));
@@ -97,10 +94,7 @@
             SkFontStyle fs;
             set->getStyle(j, &fs, NULL);
 
-            // We use a typeface which randomy returns unexpected mask formats to fuzz
-            SkAutoTUnref<SkTypeface> orig(set->createTypeface(j));
-            SkAutoTUnref<SkTypeface> typeface(SkNEW_ARGS(SkRandomTypeface, (orig, paint, true)));
-            paint.setTypeface(typeface);
+            SkSafeUnref(paint.setTypeface(set->createTypeface(j)));
 
             SkTextBlobBuilder builder;
             for (int aa = 0; aa < 2; aa++) {
@@ -109,9 +103,6 @@
                         paint.setAntiAlias(SkToBool(aa));
                         paint.setSubpixelText(SkToBool(subpixel));
                         paint.setLCDRenderText(SkToBool(lcd));
-                        if (!SkToBool(lcd)) {
-                            paint.setTextSize(160);
-                        }
                         const SkTextBlobBuilder::RunBuffer& run = builder.allocRun(paint,
                                                                                    MAX_TOTAL_TEXT,
                                                                                    0, 0,