This caused failures in ui_unittests FontListTest.Fonts_GetHeight_GetBaseline

trunk/src/ui/gfx/font_list.h

 // Copyright (c) 2012 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.
 
 #ifndef UI_GFX_FONT_LIST_H_
 #define UI_GFX_FONT_LIST_H_
 
 #include <string>
 #include <vector>
 
-#include "base/gtest_prod_util.h"
 #include "ui/base/ui_export.h"
 #include "ui/gfx/font.h"
 
 namespace gfx {
 
 // FontList represents a list of fonts either in the form of Font vector or in
 // the form of a string representing font names, styles, and size.
 //
 // The string representation is in the form "FAMILY_LIST [STYLE_OPTIONS] SIZE",
 // where FAMILY_LIST is a comma separated list of families terminated by a
@@ skipping 29 matching lines @@
 
   ~FontList();
 
   // Returns a new FontList with the given |font_style| flags.
   FontList DeriveFontList(int font_style) const;
 
   // Returns a new FontList with the same font names and style but with the
   // 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;
 
   // Returns a string representing font names, styles, and size. If the FontList
   // is initialized by a vector of Font, use the first font's style and size
   // for the description.
   const std::string& GetFontDescriptionString() const;
 
   // Returns the Font vector.
   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.
   mutable std::vector<Font> fonts_;
 
   // A string representing font names, styles, and sizes.
   // Please refer to the comments before class declaration for details on string
   // format.
   // If FontList is constructed with a vector of font,
   // |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
 
 #endif  // UI_GFX_FONT_LIST_H_