ChromeFont->gfx::Font...

app/gfx/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/chrome_font.h"
 #include "app/gfx/text_elider.h"
 #include "base/file_path.h"
 #include "base/string_util.h"
 #include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 19 matching lines @@
   const std::wstring output;
 };
 
 struct TestData {
   const std::string a;
   const std::string b;
   const int compare_result;
 };
 
 void RunTest(Testcase* testcases, size_t num_testcases) {
-  static const ChromeFont font;
+  static const gfx::Font font;
   for (size_t i = 0; i < num_testcases; ++i) {
     const GURL url(testcases[i].input);
     // Should we test with non-empty language list?
     // That's kinda redundant with net_util_unittests.
     EXPECT_EQ(testcases[i].output,
               ElideUrl(url, font, font.GetStringWidth(testcases[i].output),
                        std::wstring()));
   }
 }
 
@@ skipping 117 matching lines @@
     {FILE_PATH_LITERAL("file name.longext"),
       L"file" + kEllipsisStr + L".longext"},
     {FILE_PATH_LITERAL("fil ename.longext"),
       L"fil " + kEllipsisStr + L".longext"},
     {FILE_PATH_LITERAL("filename.longext"),
       L"file" + kEllipsisStr + L".longext"},
     {FILE_PATH_LITERAL("filename.middleext.longext"),
       L"filename.mid" + kEllipsisStr + L".longext"}
   };
 
-  static const ChromeFont font;
+  static const gfx::Font font;
   for (size_t i = 0; i < arraysize(testcases); ++i) {
     FilePath filepath(testcases[i].input);
     EXPECT_EQ(testcases[i].output, ElideFilename(filepath,
         font,
         font.GetStringWidth(testcases[i].output)));
   }
 }
 
 TEST(TextEliderTest, ElideTextLongStrings) {
   const std::wstring kEllipsisStr(kEllipsis);
@@ skipping 14 matching lines @@
      {data_scheme + thousand_a,
       data_scheme + std::wstring(156, L'a') + kEllipsisStr},
      {data_scheme + ten_thousand_a,
       data_scheme + std::wstring(156, L'a') + kEllipsisStr},
      {data_scheme + hundred_thousand_a,
       data_scheme + std::wstring(156, L'a') + kEllipsisStr},
      {data_scheme + million_a,
       data_scheme + std::wstring(156, L'a') + kEllipsisStr},
   };
 
-  const ChromeFont font;
+  const gfx::Font font;
   int ellipsis_width = font.GetStringWidth(kEllipsisStr);
   for (size_t i = 0; i < arraysize(testcases); ++i) {
     // Compare sizes rather than actual contents because if the test fails,
     // output is rather long.
     EXPECT_EQ(testcases[i].output.size(),
               ElideText(testcases[i].input, font,
                         font.GetStringWidth(testcases[i].output)).size());
     EXPECT_EQ(kEllipsisStr,
               ElideText(testcases[i].input, font, ellipsis_width));
   }
@@ skipping 34 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()));
   }
 }