This caused failures in ui_unittests FontListTest.Fonts_GetHeight_GetBaseline

trunk/src/ui/gfx/font_list.h

Index: trunk/src/ui/gfx/font_list.h
===================================================================
--- trunk/src/ui/gfx/font_list.h	(revision 211668)
+++ trunk/src/ui/gfx/font_list.h	(working copy)
@@ -8,7 +8,6 @@
 #include <string>
 #include <vector>
 
-#include "base/gtest_prod_util.h"
 #include "ui/base/ui_export.h"
 #include "ui/gfx/font.h"
 
@@ -58,14 +57,6 @@
   // given font |size| in pixels.
   FontList DeriveFontListWithSize(int size) const;
 
-  // Returns the height of this font list, which is max(ascent) + max(descent)
-  // for all the fonts in the font list.
-  int GetHeight() const;
-
-  // Returns the baseline of this font list, which is max(baseline) for all the
-  // fonts in the font list.
-  int GetBaseline() const;
-
   // Returns the |gfx::Font::FontStyle| style flags for this font list.
   int GetFontStyle() const;
 
@@ -78,8 +69,6 @@
   const std::vector<Font>& GetFonts() const;
 
  private:
-  FRIEND_TEST_ALL_PREFIXES(FontListTest, Fonts_GetHeight_GetBaseline);
-
   // A vector of Font. If FontList is constructed with font description string,
   // |fonts_| is not initialized during construction. Instead, it is computed
   // lazily when user asked to get the font vector.
@@ -92,10 +81,6 @@
   // |font_description_string_| is not initialized during construction. Instead,
   // it is computed lazily when user asked to get the font description string.
   mutable std::string font_description_string_;
-
-  // The cached common height and baseline of the fonts in the font list.
-  mutable int common_height_;
-  mutable int common_baseline_;
 };
 
 }  // namespace gfx