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

chrome/browser/metrics/metrics_log.cc

 // Copyright (c) 2012 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 "chrome/browser/metrics/metrics_log.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 40 matching lines @@
 #include "gpu/config/gpu_info.h"
 #include "ui/gfx/screen.h"
 #include "url/gurl.h"
 
 #if defined(OS_ANDROID)
 #include "base/android/build_info.h"
 #endif
 
 #if defined(OS_WIN)
 #include "base/win/metro.h"
-#include "ui/gfx/dpi_win.h"
+#include "ui/gfx/win/dpi.h"
 
 // http://blogs.msdn.com/oldnewthing/archive/2004/10/25/247180.aspx
 extern "C" IMAGE_DOS_HEADER __ImageBase;
 #endif
 
 using content::GpuDataManager;
 using metrics::OmniboxEventProto;
 using metrics::PerfDataProto;
 using metrics::ProfilerEventProto;
 using metrics::SystemProfileProto;
@@ skipping 879 matching lines @@
 
       paired_device->set_vendor_prefix(vendor_prefix);
     }
 
     paired_device->set_vendor_id(device->GetVendorID());
     paired_device->set_product_id(device->GetProductID());
     paired_device->set_device_id(device->GetDeviceID());
   }
 #endif  // defined(OS_CHROMEOS)
 }