FontAccess: Consolidate cache readiness hook

Consolidate the cache readiness hook implementations in the base class
because all the implementations ended up the same.

Bug: 1043306
Change-Id: I814c4eb4ca464247336f263ba98af1a1dfd39d7b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2422352
Commit-Queue: Olivier Yiptong <oyiptong@chromium.org>
Reviewed-by: Joshua Bell <jsbell@chromium.org>
Cr-Commit-Position: refs/heads/master@{#809499}

content/browser/font_access/font_enumeration_cache.cc

@@ -43,6 +43,12 @@ void FontEnumerationCache::QueueShareMemoryRegionWhenReady(
   }
 }
 
+bool FontEnumerationCache::IsFontEnumerationCacheReady() {
+  DCHECK(base::FeatureList::IsEnabled(blink::features::kFontAccess));
+
+  return enumeration_cache_built_.IsSet() && IsFontEnumerationCacheValid();
+}
+
 void FontEnumerationCache::ResetStateForTesting() {
   callbacks_task_runner_ =
       base::MakeRefCounted<base::DeferredSequencedTaskRunner>();

content/browser/font_access/font_enumeration_cache.h

@@ -45,7 +45,7 @@ class CONTENT_EXPORT FontEnumerationCache {
 
   // Returns whether the cache population has completed and the shared memory
   // region is ready.
-  virtual bool IsFontEnumerationCacheReady() = 0;
+  bool IsFontEnumerationCacheReady();
 
   void ResetStateForTesting();
 

content/browser/font_access/font_enumeration_cache_fontconfig.cc

@@ -63,12 +63,6 @@ FontEnumerationCache* FontEnumerationCache::GetInstance() {
   return instance.get();
 }
 
-bool FontEnumerationCacheFontconfig::IsFontEnumerationCacheReady() {
-  DCHECK(base::FeatureList::IsEnabled(blink::features::kFontAccess));
-
-  return enumeration_cache_built_.IsSet() && IsFontEnumerationCacheValid();
-}
-
 void FontEnumerationCacheFontconfig::SchedulePrepareFontEnumerationCache() {
   DCHECK(base::FeatureList::IsEnabled(blink::features::kFontAccess));
 

content/browser/font_access/font_enumeration_cache_fontconfig.h

@@ -26,9 +26,6 @@ class CONTENT_EXPORT FontEnumerationCacheFontconfig
 
   static FontEnumerationCacheFontconfig* GetInstance();
 
-  // FontEnumerationCache interface.
-  bool IsFontEnumerationCacheReady() override;
-
  protected:
   // FontEnumerationCache interface.
   void SchedulePrepareFontEnumerationCache() override;

content/browser/font_access/font_enumeration_cache_mac.h

@@ -31,9 +31,6 @@ class CONTENT_EXPORT FontEnumerationCacheMac : public FontEnumerationCache {
 
   static FontEnumerationCacheMac* GetInstance();
 
-  // FontEnumerationCache interface.
-  bool IsFontEnumerationCacheReady() override;
-
  protected:
   // FontEnumerationCache interface.
   void SchedulePrepareFontEnumerationCache() override;

content/browser/font_access/font_enumeration_cache_mac.mm

@@ -45,12 +45,6 @@ FontEnumerationCache* FontEnumerationCache::GetInstance() {
   return instance.get();
 }
 
-bool FontEnumerationCacheMac::IsFontEnumerationCacheReady() {
-  DCHECK(base::FeatureList::IsEnabled(blink::features::kFontAccess));
-
-  return enumeration_cache_built_.IsSet() && IsFontEnumerationCacheValid();
-}
-
 void FontEnumerationCacheMac::SchedulePrepareFontEnumerationCache() {
   DCHECK(base::FeatureList::IsEnabled(blink::features::kFontAccess));
 

content/browser/font_access/font_enumeration_cache_win.cc

@@ -185,12 +185,6 @@ FontEnumerationCache* FontEnumerationCache::GetInstance() {
   return instance.get();
 }
 
-bool FontEnumerationCacheWin::IsFontEnumerationCacheReady() {
-  DCHECK(base::FeatureList::IsEnabled(blink::features::kFontAccess));
-
-  return enumeration_cache_built_.IsSet() && IsFontEnumerationCacheValid();
-}
-
 void FontEnumerationCacheWin::InitializeDirectWrite() {
   if (direct_write_initialized_)
     return;

content/browser/font_access/font_enumeration_cache_win.h

@@ -45,9 +45,6 @@ class CONTENT_EXPORT FontEnumerationCacheWin : public FontEnumerationCache {
   };
   static FontEnumerationCacheWin* GetInstance();
 
-  // FontEnumerationCache interface.
-  bool IsFontEnumerationCacheReady() override;
-
  protected:
   // FontEnumerationCache interface.
   void SchedulePrepareFontEnumerationCache() override;