Revert of DirectWrite Font Cache browser side hookup

content/common/dwrite_font_platform_win.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/public/common/dwrite_font_platform_win.h"
+#include "content/common/dwrite_font_platform_win.h"
 
 #include <dwrite.h>
 #include <map>
 #include <string>
 #include <utility>
 #include <vector>
 #include <wrl/implements.h>
 #include <wrl/wrappers/corewrappers.h>
 
 #include "base/command_line.h"
@@ skipping 10 matching lines @@
 #include "base/path_service.h"
 #include "base/process/process_handle.h"
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/synchronization/lock.h"
 #include "base/time/time.h"
 #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 {
 
 // Font Cache implementation short story:
 // Due to our sandboxing restrictions, we cannot connect to Windows font cache
 // service from Renderer and need to use DirectWrite isolated font loading
 // mechanism.
 // DirectWrite needs to be initialized before any of the API could be used.
 // During initialization DirectWrite loads all font files and populates
 // internal cache, we refer this phase as enumeration and we are trying
@@ skipping 1119 matching lines @@
     CHECK(false);
     return false;
   }
 
   DCHECK(!g_shared_font_cache.IsValid());
   g_shared_font_cache.Set(mapping);
 
   return true;
 }
 
-bool BuildFontCache(const base::FilePath& file) {
-  return BuildFontCacheInternal(file.value().c_str());
+// Assumption for this function is that it will get called through a posted task
+// on FILE thread.
+bool BuildAndLoadFontCache(const base::FilePath& file) {
+  if (BuildFontCacheInternal(file.value().c_str()))
+    return LoadFontCache(file);
+  return false;
 }
 
 }  // namespace content