Move check for --disable-directwrite-for-ui switch

ui/gfx/win/direct_write.cc

Index: ui/gfx/win/direct_write.cc
diff --git a/ui/gfx/win/direct_write.cc b/ui/gfx/win/direct_write.cc
index 71a023f316b6d35652b34f0774a3333e333774cb..bf8c881d946c73d2a4308420391b2b6f4a04f3c6 100644
--- a/ui/gfx/win/direct_write.cc
+++ b/ui/gfx/win/direct_write.cc
@@ -44,11 +44,8 @@ bool ShouldUseDirectWrite() {
 }
 
 void CreateDWriteFactory(IDWriteFactory** factory) {
-  if (!ShouldUseDirectWrite() ||
-      base::CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kDisableDirectWriteForUI)) {
+  if (!ShouldUseDirectWrite())
     return;
-  }
 
   using DWriteCreateFactoryProc = decltype(DWriteCreateFactory)*;
   HMODULE dwrite_dll = LoadLibraryW(L"dwrite.dll");
@@ -78,6 +75,11 @@ void MaybeInitializeDirectWrite() {
     return;
   tried_dwrite_initialize = true;
 
+  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kDisableDirectWriteForUI)) {
+    return;
+  }
+
   base::win::ScopedComPtr<IDWriteFactory> factory;
   CreateDWriteFactory(factory.Receive());