Pass in the right sender to font proxy init

content/child/dwrite_font_proxy/dwrite_font_proxy_init_win.cc

Index: content/child/dwrite_font_proxy/dwrite_font_proxy_init_win.cc
diff --git a/content/child/dwrite_font_proxy/dwrite_font_proxy_init_win.cc b/content/child/dwrite_font_proxy/dwrite_font_proxy_init_win.cc
index 7a9a9efef80a0f36e49101e4e566929a76ef30df..c1d59d29a8ce42e0b84aa45d1dc5c6e584b8d9f7 100644
--- a/content/child/dwrite_font_proxy/dwrite_font_proxy_init_win.cc
+++ b/content/child/dwrite_font_proxy/dwrite_font_proxy_init_win.cc
@@ -69,13 +69,6 @@ void InitializeDWriteFontProxy() {
 
   CreateDirectWriteFactory(&factory);
 
-  if (!g_font_collection) {
-    mswr::MakeAndInitialize<DWriteFontCollectionProxy>(
-        &g_font_collection, factory.Get(), g_sender_override);
-  }
-
-  mswr::ComPtr<IDWriteFontFallback> font_fallback;
-  mswr::ComPtr<IDWriteFactory2> factory2;
   IPC::Sender* sender = g_sender_override;
 
   // Hack for crbug.com/631254: set the sender if we can get one, so that when
@@ -84,6 +77,14 @@ void InitializeDWriteFontProxy() {
   if (!sender && ChildThreadImpl::current())
     sender = ChildThreadImpl::current()->thread_safe_sender();
 
+  if (!g_font_collection) {
+    mswr::MakeAndInitialize<DWriteFontCollectionProxy>(
+        &g_font_collection, factory.Get(), sender);
+  }
+
+  mswr::ComPtr<IDWriteFontFallback> font_fallback;
+  mswr::ComPtr<IDWriteFactory2> factory2;
+
   if (SUCCEEDED(factory.As(&factory2)) && factory2.Get()) {
     mswr::MakeAndInitialize<FontFallback>(
         &font_fallback, g_font_collection.Get(), sender);