Refactor Windows DPI Point, Rect, and Size for Multiple Monitor DPI Awareness

content/child/npapi/webplugin_delegate_impl_win.cc

Index: content/child/npapi/webplugin_delegate_impl_win.cc
diff --git a/content/child/npapi/webplugin_delegate_impl_win.cc b/content/child/npapi/webplugin_delegate_impl_win.cc
index d64af01c4fdb989cbb2ff0049d7983a3bedfeae9..3304aec22e26ad6b5848a883ea91608e457e8ff6 100644
--- a/content/child/npapi/webplugin_delegate_impl_win.cc
+++ b/content/child/npapi/webplugin_delegate_impl_win.cc
@@ -31,7 +31,7 @@
 #include "content/public/common/content_constants.h"
 #include "skia/ext/platform_canvas.h"
 #include "third_party/WebKit/public/web/WebInputEvent.h"
-#include "ui/gfx/win/dpi.h"
+#include "ui/gfx/screen_win.h"
 #include "ui/gfx/win/hwnd_util.h"
 
 using blink::WebKeyboardEvent;
@@ -759,8 +759,10 @@ bool WebPluginDelegateImpl::WindowedReposition(
     return false;
   }
 
-  gfx::Rect window_rect = gfx::win::DIPToScreenRect(window_rect_in_dip);
-  gfx::Rect clip_rect = gfx::win::DIPToScreenRect(clip_rect_in_dip);
+  gfx::Rect window_rect = gfx::ScreenWin::DIPToScreenRect(windowed_handle_,
+                                                          window_rect_in_dip);
+  gfx::Rect clip_rect = gfx::ScreenWin::DIPToScreenRect(windowed_handle_,
+                                                        clip_rect_in_dip);
   if (window_rect_ == window_rect && clip_rect_ == clip_rect)
     return false;