Consolidate Windows bitmap and DC code

ui/gfx/gdi_util.h

Index: ui/gfx/gdi_util.h
diff --git a/ui/gfx/gdi_util.h b/ui/gfx/gdi_util.h
index d53fa7a8de41f19b7e9abb9a02e31e2f27a8d08d..3687454afdd57d86ebe2ae1d2a8b72089efddee0 100644
--- a/ui/gfx/gdi_util.h
+++ b/ui/gfx/gdi_util.h
@@ -8,32 +8,16 @@
 #include <windows.h>
 #include <vector>
 
-#include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/gfx_export.h"
-#include "ui/gfx/path.h"
 
 namespace gfx {
 
-// Creates a BITMAPINFOHEADER structure given the bitmap's size.
-GFX_EXPORT void CreateBitmapHeader(int width, int height,
-                                   BITMAPINFOHEADER* hdr);
-
 // Creates a BITMAPV4HEADER structure given the bitmap's size.  You probably
 // only need to use BMP V4 if you need transparency (alpha channel). This
 // function sets the AlphaMask to 0xff000000.
 GFX_EXPORT void CreateBitmapV4Header(int width, int height,
                                      BITMAPV4HEADER* hdr);
 
-// Creates a monochrome bitmap header.
-void CreateMonochromeBitmapHeader(int width, int height, BITMAPINFOHEADER* hdr);
-
-// Modify the given hrgn by subtracting the given rectangles.
-GFX_EXPORT void SubtractRectanglesFromRegion(
-    HRGN hrgn,
-    const std::vector<gfx::Rect>& cutouts);
-
-GFX_EXPORT HRGN ConvertPathToHRGN(const gfx::Path& path);
-
 // Calculate scale to fit an entire page on DC.
 GFX_EXPORT float CalculatePageScale(HDC dc, int page_width, int page_height);