Retrieve font metrics from skia if DirectWrite is enabled for font metrics calculations in the chrome browser UI.

The previous patch for getting the correct font metrics from DirectWrite https://codereview.chromium.org/692633003/
was wrong as it did not return the correct font metrics in all cases.

Getting the metrics from skia ensures that we get the same font metrics which would be used by skia for rendering.

Changes in this patch are as below:-
1. Removed DirectWrite factory code from PlatformFontWin. The PlatformFontWin::ConvertGDIFontToDirectWriteFont
   function has been replaced by the CreateHFontRefFromSkia function. This function is called if DirectWrite is
   enabled in the browser which sets a static bool on the PlatformFontWin class.

BUG=428645,427804,427802

Review URL: https://codereview.chromium.org/696913002

Cr-Commit-Position: refs/heads/master@{#302547}

1 files changed, 2 insertions, 1 deletions

diff --git a/content/browser/browser_main_runner.cc b/content/browser/browser_main_runner.cc
index e7381ae..4a74b6e 100644
--- a/content/browser/browser_main_runner.cc
+++ b/content/browser/browser_main_runner.cc
@@ -20,6 +20,7 @@
 #include "ui/base/ime/input_method_initializer.h"
 
 #if defined(OS_WIN)
+#include <dwrite.h>
 #include "base/win/win_util.h"
 #include "base/win/windows_version.h"
 #include "net/cert/sha256_legacy_support_win.h"
@@ -140,7 +141,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);
   }
 }