Pass in the right sender to font proxy init

content/child/dwrite_font_proxy/dwrite_font_proxy_init_win.cc

 // Copyright 2015 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/child/dwrite_font_proxy/dwrite_font_proxy_init_win.h"
 
 #include <dwrite.h>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 51 matching lines @@
       reinterpret_cast<IUnknown**>(factory))));
 }
 
 }  // namespace
 
 void InitializeDWriteFontProxy() {
   mswr::ComPtr<IDWriteFactory> factory;
 
   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
   // Flash calls into the font proxy from a different thread we will have a
   // sender available.
   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);
   }
 
   sk_sp<SkFontMgr> skia_font_manager(SkFontMgr_New_DirectWrite(
       factory.Get(), g_font_collection.Get(), font_fallback.Get()));
   blink::WebFontRendering::setSkiaFontManager(skia_font_manager.get());
 
   // Add an extra ref for SetDefaultSkiaFactory, which keeps a ref but doesn't
@@ skipping 17 matching lines @@
 void UninitializeDWriteFontProxy() {
   if (g_font_collection)
     g_font_collection->Unregister();
 }
 
 void SetDWriteFontProxySenderForTesting(IPC::Sender* sender) {
   g_sender_override = sender;
 }
 
 }  // namespace content