Revert "Make SkRemoteGlyphCache tests use private glyph cache"

This reverts commit 3e36ce6e660ad585c58c5cc5591f23a46fcab767.

Reason for revert: Too much verification

Original change's description:
> Make SkRemoteGlyphCache tests use private glyph cache
> 
> Change-Id: If6aa189f3badc7558ab8ecf71ee3d704b275b20f
> Reviewed-on: https://skia-review.googlesource.com/136225
> Commit-Queue: Herb Derby <herb@google.com>
> Reviewed-by: Mike Klein <mtklein@google.com>

TBR=mtklein@google.com,herb@google.com

Change-Id: Ia0c096abd0ab651bc7c907f0595af4f07c88fb5e
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/136478
Reviewed-by: Herb Derby <herb@google.com>
Commit-Queue: Herb Derby <herb@google.com>

1 files changed, 1 insertions, 3 deletions

diff --git a/src/core/SkTypeface_remote.h b/src/core/SkTypeface_remote.h
index f4d3f73e2b..88628d13b4 100644
--- a/src/core/SkTypeface_remote.h
+++ b/src/core/SkTypeface_remote.h
@@ -18,7 +18,6 @@
 #include "SkTypeface.h"
 
 class SkTypefaceProxy;
-class SkStrikeCache;
 
 class SkScalerContextProxy : public SkScalerContext {
 public:
@@ -27,7 +26,7 @@ public:
                          const SkDescriptor* desc,
                          sk_sp<SkStrikeClient::DiscardableHandleManager> manager);
 
-    void initCache(SkGlyphCache*, SkStrikeCache*);
+    void initCache(SkGlyphCache*);
 
 protected:
     unsigned generateGlyphCount() override;
@@ -42,7 +41,6 @@ protected:
 private:
     sk_sp<SkStrikeClient::DiscardableHandleManager> fDiscardableManager;
     SkGlyphCache* fCache = nullptr;
-    SkStrikeCache* fStrikeCache = nullptr;
     typedef SkScalerContext INHERITED;
 };