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

app/resource_bundle_posix.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/resource_bundle.h"
 
-#include "app/gfx/font.h"
 #include "app/l10n_util.h"
 #include "base/data_pack.h"
 #include "base/logging.h"
 #include "base/string16.h"
 #include "base/string_piece.h"
+#include "gfx/font.h"
 
 namespace {
 
 base::DataPack* LoadResourcesDataPak(FilePath resources_pak_path) {
   base::DataPack* resources_pak = new base::DataPack;
   bool success = resources_pak->Load(resources_pak_path);
   if (!success) {
     delete resources_pak;
     resources_pak = NULL;
   }
@@ skipping 69 matching lines @@
   FilePath locale_file_path = GetLocaleFilePath(app_locale);
   if (locale_file_path.empty()) {
     // It's possible that there is no locale.pak.
     NOTREACHED();
     return std::string();
   }
   locale_resources_data_ = LoadResourcesDataPak(locale_file_path);
   CHECK(locale_resources_data_) << "failed to load locale.pak";
   return app_locale;
 }