Move the ShouldUseDirectWrite function from sandbox_win.cc/.h to ui/gfx/win/dpi.cc/.h.

content/shell/renderer/layout_test/layout_test_content_renderer_client.cc

 // Copyright (c) 2014 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/shell/renderer/layout_test/layout_test_content_renderer_client.h"
 
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/debug/debugger.h"
 #include "components/web_cache/renderer/web_cache_render_process_observer.h"
-#include "content/common/sandbox_win.h"
 #include "content/public/common/content_constants.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/renderer/render_view.h"
 #include "content/public/test/layouttest_support.h"
 #include "content/shell/common/shell_switches.h"
 #include "content/shell/common/webkit_test_helpers.h"
 #include "content/shell/renderer/layout_test/layout_test_render_frame_observer.h"
 #include "content/shell/renderer/layout_test/layout_test_render_process_observer.h"
 #include "content/shell/renderer/layout_test/webkit_test_runner.h"
 #include "content/shell/renderer/shell_render_view_observer.h"
 #include "content/shell/renderer/test_runner/mock_credential_manager_client.h"
 #include "content/shell/renderer/test_runner/web_test_interfaces.h"
 #include "content/shell/renderer/test_runner/web_test_proxy.h"
 #include "content/test/mock_webclipboard_impl.h"
 #include "ppapi/shared_impl/ppapi_switches.h"
 #include "third_party/WebKit/public/platform/WebMediaStreamCenter.h"
 #include "third_party/WebKit/public/web/WebPluginParams.h"
 #include "third_party/WebKit/public/web/WebView.h"
 #include "v8/include/v8.h"
 
 #if defined(OS_WIN)
 #include "content/public/renderer/render_font_warmup_win.h"
 #include "third_party/WebKit/public/web/win/WebFontRendering.h"
 #include "third_party/skia/include/ports/SkFontMgr.h"
+#include "ui/gfx/win/direct_write.h"
 #endif
 
 using blink::WebAudioDevice;
 using blink::WebClipboard;
 using blink::WebLocalFrame;
 using blink::WebMIDIAccessor;
 using blink::WebMIDIAccessorClient;
 using blink::WebMediaStreamCenter;
 using blink::WebMediaStreamCenterClient;
 using blink::WebPlugin;
@@ skipping 22 matching lines @@
 
 }  // namespace
 #endif  // OS_WIN
 
 LayoutTestContentRendererClient::LayoutTestContentRendererClient() {
   EnableWebTestProxyCreation(
       base::Bind(&LayoutTestContentRendererClient::WebTestProxyCreated,
                  base::Unretained(this)));
 
 #if defined(OS_WIN)
-  if (ShouldUseDirectWrite())
+  if (gfx::win::ShouldUseDirectWrite())
     RegisterSideloadedTypefaces(GetPreSandboxWarmupFontMgr());
 #endif
 }
 
 LayoutTestContentRendererClient::~LayoutTestContentRendererClient() {
 }
 
 void LayoutTestContentRendererClient::RenderThreadStarted() {
   ShellContentRendererClient::RenderThreadStarted();
   shell_observer_.reset(new LayoutTestRenderProcessObserver());
@@ skipping 82 matching lines @@
     LayoutTestRenderProcessObserver::GetInstance()->SetTestDelegate(
         test_runner);
   }
   proxy->SetInterfaces(
       LayoutTestRenderProcessObserver::GetInstance()->test_interfaces());
   test_runner->proxy()->SetDelegate(
       LayoutTestRenderProcessObserver::GetInstance()->test_delegate());
 }
 
 }  // namespace content