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

gfx/canvas_win.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 "app/gfx/canvas.h"
+#include "gfx/canvas.h"
 
 #include <limits>
 
-#include "app/gfx/font.h"
 #include "base/i18n/rtl.h"
+#include "gfx/font.h"
 #include "gfx/rect.h"
 #include "third_party/skia/include/core/SkShader.h"
 
 namespace {
 
 // We make sure that LTR text we draw in an RTL context is modified
 // appropriately to make sure it maintains it LTR orientation.
 void DoDrawText(HDC hdc, const std::wstring& text,
                 RECT* text_bounds, int flags) {
   std::wstring localized_text;
@@ skipping 256 matching lines @@
         text_row[cur_x] |= 0xff << SK_A32_SHIFT;  // Make opaque.
       }
     }
   }
 
   // Draw the halo bitmap with blur.
   drawBitmap(text_bitmap, SkIntToScalar(x - 1), SkIntToScalar(y - 1));
 }
 
 }  // namespace gfx