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

app/gfx/font_util.cc

 // Copyright (c) 2009 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 "app/gfx/font_util.h"
 
-#include "app/gfx/font.h"
 #include "app/l10n_util.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
+#include "gfx/font.h"
 
 namespace gfx {
 
 int GetLocalizedContentsWidthForFont(int col_resource_id,
                                      const gfx::Font& font) {
   double chars = 0;
   StringToDouble(WideToUTF8(l10n_util::GetString(col_resource_id)), &chars);
   int width = font.GetExpectedTextWidth(static_cast<int>(chars));
   DCHECK_GT(width, 0);
   return width;
 }
 
 int GetLocalizedContentsHeightForFont(int row_resource_id,
                                       const gfx::Font& font) {
   double lines = 0;
   StringToDouble(WideToUTF8(l10n_util::GetString(row_resource_id)), &lines);
   int height = static_cast<int>(font.height() * lines);
   DCHECK_GT(height, 0);
   return height;
 }
 
 gfx::Size GetLocalizedContentsSizeForFont(int col_resource_id,
                                           int row_resource_id,
                                           const gfx::Font& font) {
   return gfx::Size(GetLocalizedContentsWidthForFont(col_resource_id, font),
                    GetLocalizedContentsHeightForFont(row_resource_id, font));
 }
 
 }  // namespace gfx