Enable hidpi on Linux, refactor a bit on Windows to share

chrome/browser/icon_loader_win.cc

Index: chrome/browser/icon_loader_win.cc
diff --git a/chrome/browser/icon_loader_win.cc b/chrome/browser/icon_loader_win.cc
index d0d77dc261039a16047a5e3f7a82a5c5de7c30bc..8a45286fc207efeeaa5d009cc5f090b16618da43 100644
--- a/chrome/browser/icon_loader_win.cc
+++ b/chrome/browser/icon_loader_win.cc
@@ -11,10 +11,10 @@
 #include "base/message_loop/message_loop.h"
 #include "base/threading/thread.h"
 #include "third_party/skia/include/core/SkBitmap.h"
+#include "ui/gfx/dpi.h"
 #include "ui/gfx/icon_util.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/size.h"
-#include "ui/gfx/win/dpi.h"
 
 // static
 IconGroupID IconLoader::ReadGroupIDFromFilepath(
@@ -61,8 +61,8 @@ void IconLoader::ReadIcon() {
     scoped_ptr<SkBitmap> bitmap(IconUtil::CreateSkBitmapFromHICON(
         file_info.hIcon));
     if (bitmap.get()) {
-      gfx::ImageSkia image_skia(gfx::ImageSkiaRep(
-          *bitmap, gfx::win::GetDeviceScaleFactor()));
+      gfx::ImageSkia image_skia(
+          gfx::ImageSkiaRep(*bitmap, gfx::GetDeviceScaleFactor()));
       image_skia.MakeThreadSafe();
       image_.reset(new gfx::Image(image_skia));
       DestroyIcon(file_info.hIcon);