Remove GetMonitorInfoWrapper, which is no longer needed.

ui/gfx/win/hwnd_util.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 "ui/gfx/win/hwnd_util.h"
 
 #include "base/i18n/rtl.h"
 #include "base/strings/string_util.h"
 #include "base/win/metro.h"
 #include "base/win/win_util.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/size.h"
 
 namespace gfx {
 
 namespace {
 
 // Adjust the window to fit.
 void AdjustWindowToFit(HWND hwnd, const RECT& bounds, bool fit_to_monitor) {
   if (fit_to_monitor) {
     // Get the monitor.
     HMONITOR hmon = MonitorFromRect(&bounds, MONITOR_DEFAULTTONEAREST);
     if (hmon) {
       MONITORINFO mi;
       mi.cbSize = sizeof(mi);
-      base::win::GetMonitorInfoWrapper(hmon, &mi);
+      GetMonitorInfo(hmon, &mi);
       Rect window_rect(bounds);
       Rect monitor_rect(mi.rcWork);
       Rect new_window_rect = window_rect;
       new_window_rect.AdjustToFit(monitor_rect);
       if (new_window_rect != window_rect) {
         // Window doesn't fit on monitor, move and possibly resize.
         SetWindowPos(hwnd, 0, new_window_rect.x(), new_window_rect.y(),
                      new_window_rect.width(), new_window_rect.height(),
                      SWP_NOACTIVATE | SWP_NOZORDER);
         return;
@@ skipping 105 matching lines @@
     // If there is a parent, center over the parents bounds.
     ::GetWindowRect(parent, &center_bounds);
   }
 
   if (::IsRectEmpty(&center_bounds)) {
     // No parent or no parent rect. Center over the monitor the window is on.
     HMONITOR monitor = MonitorFromWindow(window, MONITOR_DEFAULTTONEAREST);
     if (monitor) {
       MONITORINFO mi = {0};
       mi.cbSize = sizeof(mi);
-      base::win::GetMonitorInfoWrapper(monitor, &mi);
+      GetMonitorInfo(monitor, &mi);
       center_bounds = mi.rcWork;
     } else {
       NOTREACHED() << "Unable to get default monitor";
     }
   }
 
   window_bounds.left = center_bounds.left;
   if (pref.width() < (center_bounds.right - center_bounds.left)) {
     window_bounds.left +=
         (center_bounds.right - center_bounds.left - pref.width()) / 2;
@@ skipping 71 matching lines @@
   HMODULE metro = base::win::GetMetroModule();
   if (!metro)
     return get_real_hwnd ? ::GetDesktopWindow() : HWND_DESKTOP;
   // In windows 8 metro-mode the root window is not the desktop.
   RootWindow root_window =
       reinterpret_cast<RootWindow>(::GetProcAddress(metro, "GetRootWindow"));
   return root_window();
 }
 
 }  // namespace gfx