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

app/text_elider_unittest.cc

 // 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.
 
-#include "app/gfx/font.h"
 #include "app/text_elider.h"
 #include "app/l10n_util.h"
 #include "base/file_path.h"
 #include "base/i18n/rtl.h"
 #include "base/string_util.h"
+#include "gfx/font.h"
 #include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 const wchar_t kEllipsis[] = L"\x2026";
 
 struct Testcase {
   const std::string input;
   const std::wstring output;
@@ skipping 241 matching lines @@
     { "http://www.a/", "http://b/", -1 },
   };
 
   for (size_t i = 0; i < arraysize(tests); ++i) {
     gfx::SortedDisplayURL url1(GURL(tests[i].a), std::wstring());
     gfx::SortedDisplayURL url2(GURL(tests[i].b), std::wstring());
     EXPECT_EQ(tests[i].compare_result, url1.Compare(url2, collator.get()));
     EXPECT_EQ(-tests[i].compare_result, url2.Compare(url1, collator.get()));
   }
 }