DirectWrite Font Cache browser side hookup

content/common/dwrite_font_platform_win.cc

Index: content/common/dwrite_font_platform_win.cc
diff --git a/content/common/dwrite_font_platform_win.cc b/content/common/dwrite_font_platform_win.cc
index 21c200015a50cb08318656b278d330026d7b5c9b..c164a7d84337d06ccfc4d3585a6a7415166b2006 100644
--- a/content/common/dwrite_font_platform_win.cc
+++ b/content/common/dwrite_font_platform_win.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/common/dwrite_font_platform_win.h"
+#include "content/public/common/dwrite_font_platform_win.h"
 
 #include <dwrite.h>
 #include <map>
@@ -33,7 +33,6 @@
 #include "base/win/registry.h"
 #include "base/win/scoped_comptr.h"
 #include "content/public/common/content_switches.h"
-#include "content/public/common/dwrite_font_cache_win.h"
 
 namespace {
 
@@ -1157,10 +1156,8 @@ bool LoadFontCache(const base::FilePath& path) {
 
 // Assumption for this function is that it will get called through a posted task
 // on FILE thread.

[scottmg, 2014/11/13 07:35:30]

not sure how important it is, but maybe

DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));

rather than a comment

[Shrikant Kelkar, 2014/11/13 20:29:21]

Removed comment, didn't add DCHECK as all base::File call seem to be already
checking for base::ThreadRestrictions::AssertIOAllowed();

-bool BuildAndLoadFontCache(const base::FilePath& file) {
-  if (BuildFontCacheInternal(file.value().c_str()))
-    return LoadFontCache(file);
-  return false;
+bool BuildFontCache(const base::FilePath& file) {
+  return BuildFontCacheInternal(file.value().c_str());
 }
 
 }  // namespace content