Move app/gfx/canvas and app/gfx/font to gfx/.

gfx/canvas.h

 // Copyright (c) 2006-2008 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.
 
-#ifndef APP_GFX_CANVAS_H_
-#define APP_GFX_CANVAS_H_
+#ifndef GFX_CANVAS_H_
+#define GFX_CANVAS_H_
 
 #if defined(OS_WIN)
 #include <windows.h>
 #endif
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "skia/ext/platform_canvas.h"
 
@@ skipping 211 matching lines @@
   void DrawStringInt(const std::wstring& text, HFONT font,
                      const SkColor& color, int x, int y, int w, int h,
                      int flags);
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(Canvas);
 };
 
 }  // namespace gfx;
 
-#endif  // APP_GFX_CANVAS_H_
+#endif  // GFX_CANVAS_H_