Remove win_util::FormatMessage and FormatLastWin32Error. These were only used...

gfx/canvas_direct2d_unittest.cc

 // Copyright (c) 2010 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 <windows.h>
 #include <uxtheme.h>
 #include <vsstyle.h>
 #include <vssym32.h>
 
+#include "app/win/window_impl.h"
 #include "base/command_line.h"
 #include "base/ref_counted_memory.h"
 #include "base/resource_util.h"
 #include "base/scoped_ptr.h"
 #include "gfx/brush.h"
 #include "gfx/canvas_direct2d.h"
 #include "gfx/canvas_skia.h"
 #include "gfx/codec/png_codec.h"
 #include "gfx/native_theme_win.h"
-#include "gfx/window_impl.h"
 #include "gfx/win_util.h"
 #include "grit/gfx_resources.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 
 namespace {
 
 const char kVisibleModeFlag[] = "d2d-canvas-visible";
 
-class TestWindow : public gfx::WindowImpl {
+class TestWindow : public app::win::WindowImpl {
  public:
   static const int kWindowSize = 500;
   static const int kWindowPosition = 10;
 
 
   TestWindow() {
     if (CommandLine::ForCurrentProcess()->HasSwitch(kVisibleModeFlag))
       Sleep(1000);
 
     // Create the window.
@@ skipping 272 matching lines @@
     return;
   TestWindow window;
   gfx::CanvasDirect2D canvas(window.rt());
 
   SkBitmap bitmap = LoadBitmapFromResources(IDR_BITMAP_BRUSH_IMAGE);
 
   canvas.Save();
   canvas.TileImageInt(bitmap, 10, 10, 300, 300);
   canvas.Restore();
 }