Retrieve font metrics from skia if DirectWrite is enabled for font metrics calculations in the chro…

content/browser/browser_main_runner.cc

Index: content/browser/browser_main_runner.cc
diff --git a/content/browser/browser_main_runner.cc b/content/browser/browser_main_runner.cc
index e7381ae8ac12b82c7f535e57d02dcb4888bdd2f5..5eb49751bac312e10cfa41cebd453a98405dc64d 100644
--- a/content/browser/browser_main_runner.cc
+++ b/content/browser/browser_main_runner.cc
@@ -4,6 +4,8 @@
 
 #include "content/public/browser/browser_main_runner.h"
 
+#include <dwrite.h>
+
 #include "base/allocator/allocator_shim.h"
 #include "base/base_switches.h"
 #include "base/command_line.h"
@@ -140,7 +142,7 @@ void MaybeEnableDirectWriteFontRendering() {
                                    __uuidof(IDWriteFactory),
                                    reinterpret_cast<IUnknown**>(&factory))));
     SetDefaultSkiaFactory(SkFontMgr_New_DirectWrite(factory));
-    gfx::PlatformFontWin::set_direct_write_factory(factory);
+    gfx::PlatformFontWin::set_use_skia_for_font_metrics(true);
   }
 }