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

chrome/browser/cocoa/autocomplete_text_field_cell.mm

 // 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.
 
 #import "chrome/browser/cocoa/autocomplete_text_field_cell.h"
 
-#include "app/gfx/font.h"
 #include "app/resource_bundle.h"
 #include "base/logging.h"
+#include "gfx/font.h"
 
 namespace {
 
 const CGFloat kBaselineAdjust = 2.0;
 
 // How far to offset the keyword token into the field.
 const NSInteger kKeywordXOffset = 3;
 
 // How much width (beyond text) to add to the keyword token on each
 // side.
@@ skipping 429 matching lines @@
             [AutocompleteTextFieldIcon iconWithRect:blockedContentFrame
                                                view:*it]];
         iconFrame.size.width -= NSMaxX(iconFrame) - NSMinX(blockedContentFrame);
       }
     }
   }
   return result;
 }
 
 @end