Move a bunch of windows stuff from ui/base/win to ui/gfx/win

content/browser/renderer_host/render_widget_host_view_browsertest.cc

 // Copyright (c) 2013 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 "base/command_line.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/path_service.h"
 #include "base/run_loop.h"
 #include "content/browser/gpu/compositor_util.h"
 #include "content/browser/gpu/gpu_data_manager_impl.h"
@@ skipping 19 matching lines @@
 #include "ui/base/ui_base_switches.h"
 #include "ui/gfx/size_conversions.h"
 #include "ui/gfx/switches.h"
 #include "ui/gl/gl_switches.h"
 
 #if defined(OS_MACOSX)
 #include "ui/gl/io_surface_support_mac.h"
 #endif
 
 #if defined(OS_WIN)
-#include "ui/gfx/dpi_win.h"
+#include "ui/gfx/win/dpi.h"
 #endif
 
 namespace content {
 namespace {
 
 // Convenience macro: Short-circuit a pass for the tests where platform support
 // for forced-compositing mode (or disabled-compositing mode) is lacking.
 #define SET_UP_SURFACE_OR_PASS_TEST(wait_message)  \
   if (!SetUpSourceSurface(wait_message)) {  \
     LOG(WARNING)  \
@@ skipping 777 matching lines @@
  public:
   CompositingRenderWidgetHostViewTabCaptureHighDPI()
       : kScale(2.f) {
   }
 
   virtual void SetUpCommandLine(CommandLine* cmd) OVERRIDE {
     CompositingRenderWidgetHostViewBrowserTestTabCapture::SetUpCommandLine(cmd);
     cmd->AppendSwitchASCII(switches::kForceDeviceScaleFactor,
                            base::StringPrintf("%f", scale()));
 #if defined(OS_WIN)
-    cmd->AppendSwitchASCII(gfx::switches::kHighDPISupport, "1");
+    cmd->AppendSwitchASCII(switches::kHighDPISupport, "1");
     gfx::EnableHighDPISupport();
 #endif
   }
 
   float scale() const { return kScale; }
 
  private:
   virtual bool ShouldContinueAfterTestURLLoad() OVERRIDE {
     PASS_TEST_IF_SCALE_FACTOR_NOT_SUPPORTED(scale());
     return true;
@@ skipping 34 matching lines @@
                                 copy_rect,
                                 output_size,
                                 expected_bitmap_size,
                                 video_frame);
 }
 
 #endif  // !defined(OS_ANDROID) && !defined(OS_IOS)
 
 }  // namespace
 }  // namespace content