MacViews: Fix failing label-related views_unittests after r377477

MacViews: Fix failing label-related views_unittests after r377477

r377477 Set a more Maccy default font size for labels on Mac.
LabelTest.EmptyLabelSizing tests did not handle a label having a
FontList other than a default-constructed gfx::FontList(). Fix by
comparing against the actual FontList.

A selection of StyledLabelTests were failing because they compare a
StyledLabel containing a default-constructed gfx::FontList() with a
views::Label() containing the gfx::FontList corresponding to
ui::kLabelFontSizeDelta (from ui::ResourceBundle).

The StyledLabelTests could be fixed updating the tests to use
corresponding gfx::FontLists. However, StyledLabel should have the same
default FontList as views::Label anyway (i.e. not the
default-constructed gfx::FontList(), but one from ui::ResourceBundle).
So fix these by asking a Label for its FontList.

Fixes the following views_unittests on Mac:
    LabelTest.EmptyLabelSizing
    StyledLabelTest.BasicWrapping
    StyledLabelTest.DontBreakLinks
    StyledLabelTest.NoWrapping
    StyledLabelTest.StyledRangeBold
    StyledLabelTest.StyledRangeWithDisabledLineWrapping
    StyledLabelTest.StyledRangeWithTooltip
    StyledLabelTest.WrapLongWords

BUG=564879, 579380
Committed: https://crrev.com/cfb9dbdfb06b03538d859b953b3896c75ed19306
Cr-Commit-Position: refs/heads/master@{#379980}

[tapted, 2016-03-08 07:07:19]

Description was changed from

==========
MacViews: Fix failing label-related views_unittests after r377477

r377477 Set a more Maccy default font size for labels. Some tests did
not handle a label having a FontList other than a default-constructed
gfx::FontList().

Fixes:
    LabelTest.EmptyLabelSizing
    StyledLabelTest.BasicWrapping
    StyledLabelTest.DontBreakLinks
    StyledLabelTest.NoWrapping
    StyledLabelTest.StyledRangeBold
    StyledLabelTest.StyledRangeWithDisabledLineWrapping
    StyledLabelTest.StyledRangeWithTooltip
    StyledLabelTest.WrapLongWords

Well.. that fixes it

BUG=564879,579380
==========

to

==========
MacViews: Fix failing label-related views_unittests after r377477

r377477 Set a more Maccy default font size for labels.
LabelTest.EmptyLabelSizing tests did not handle a label having a
FontList other than a default-constructed gfx::FontList(). Fix by
comparing against the actual FontList.

A selection of StyledLabelTests were failing because they compare a
StyledLabel with a default-constructed gfx::FontList() with a
views::Label containing the FontList corresponding to
ui::kLabelFontSizeDelta (from ui::ResourceBundle). This can be by
updating the tests to use corresponding gfx::FontLists. However,
StyledLabel should have the same default FontList as views::Label (i.e.
not the default-constructed gfx::FontList(), but one from
ui::ResourceBundle). So fix these by asking a Label for its FontList.

Fixes the following views_unittests on Mac:
    LabelTest.EmptyLabelSizing
    StyledLabelTest.BasicWrapping
    StyledLabelTest.DontBreakLinks
    StyledLabelTest.NoWrapping
    StyledLabelTest.StyledRangeBold
    StyledLabelTest.StyledRangeWithDisabledLineWrapping
    StyledLabelTest.StyledRangeWithTooltip
    StyledLabelTest.WrapLongWords

BUG=564879,579380
==========

[tapted, 2016-03-08 07:07:19]

tapted@chromium.org changed reviewers:
+ sky@chromium.org

[tapted, 2016-03-08 07:07:37]

Description was changed from

==========
MacViews: Fix failing label-related views_unittests after r377477

r377477 Set a more Maccy default font size for labels.
LabelTest.EmptyLabelSizing tests did not handle a label having a
FontList other than a default-constructed gfx::FontList(). Fix by
comparing against the actual FontList.

A selection of StyledLabelTests were failing because they compare a
StyledLabel with a default-constructed gfx::FontList() with a
views::Label containing the FontList corresponding to
ui::kLabelFontSizeDelta (from ui::ResourceBundle). This can be by
updating the tests to use corresponding gfx::FontLists. However,
StyledLabel should have the same default FontList as views::Label (i.e.
not the default-constructed gfx::FontList(), but one from
ui::ResourceBundle). So fix these by asking a Label for its FontList.

Fixes the following views_unittests on Mac:
    LabelTest.EmptyLabelSizing
    StyledLabelTest.BasicWrapping
    StyledLabelTest.DontBreakLinks
    StyledLabelTest.NoWrapping
    StyledLabelTest.StyledRangeBold
    StyledLabelTest.StyledRangeWithDisabledLineWrapping
    StyledLabelTest.StyledRangeWithTooltip
    StyledLabelTest.WrapLongWords

BUG=564879,579380
==========

to

==========
MacViews: Fix failing label-related views_unittests after r377477

r377477 Set a more Maccy default font size for labels on Mac.
LabelTest.EmptyLabelSizing tests did not handle a label having a
FontList other than a default-constructed gfx::FontList(). Fix by
comparing against the actual FontList.

A selection of StyledLabelTests were failing because they compare a
StyledLabel with a default-constructed gfx::FontList() with a
views::Label containing the FontList corresponding to
ui::kLabelFontSizeDelta (from ui::ResourceBundle). This can be by
updating the tests to use corresponding gfx::FontLists. However,
StyledLabel should have the same default FontList as views::Label (i.e.
not the default-constructed gfx::FontList(), but one from
ui::ResourceBundle). So fix these by asking a Label for its FontList.

Fixes the following views_unittests on Mac:
    LabelTest.EmptyLabelSizing
    StyledLabelTest.BasicWrapping
    StyledLabelTest.DontBreakLinks
    StyledLabelTest.NoWrapping
    StyledLabelTest.StyledRangeBold
    StyledLabelTest.StyledRangeWithDisabledLineWrapping
    StyledLabelTest.StyledRangeWithTooltip
    StyledLabelTest.WrapLongWords

BUG=564879,579380
==========

[tapted, 2016-03-08 07:09:00]

Description was changed from

==========
MacViews: Fix failing label-related views_unittests after r377477

r377477 Set a more Maccy default font size for labels on Mac.
LabelTest.EmptyLabelSizing tests did not handle a label having a
FontList other than a default-constructed gfx::FontList(). Fix by
comparing against the actual FontList.

A selection of StyledLabelTests were failing because they compare a
StyledLabel with a default-constructed gfx::FontList() with a
views::Label containing the FontList corresponding to
ui::kLabelFontSizeDelta (from ui::ResourceBundle). This can be by
updating the tests to use corresponding gfx::FontLists. However,
StyledLabel should have the same default FontList as views::Label (i.e.
not the default-constructed gfx::FontList(), but one from
ui::ResourceBundle). So fix these by asking a Label for its FontList.

Fixes the following views_unittests on Mac:
    LabelTest.EmptyLabelSizing
    StyledLabelTest.BasicWrapping
    StyledLabelTest.DontBreakLinks
    StyledLabelTest.NoWrapping
    StyledLabelTest.StyledRangeBold
    StyledLabelTest.StyledRangeWithDisabledLineWrapping
    StyledLabelTest.StyledRangeWithTooltip
    StyledLabelTest.WrapLongWords

BUG=564879,579380
==========

to

==========
MacViews: Fix failing label-related views_unittests after r377477

r377477 Set a more Maccy default font size for labels on Mac.
LabelTest.EmptyLabelSizing tests did not handle a label having a
FontList other than a default-constructed gfx::FontList(). Fix by
comparing against the actual FontList.

A selection of StyledLabelTests were failing because they compare a
StyledLabel containing a default-constructed gfx::FontList() with a
views::Label() containing the gfx::FontList corresponding to
ui::kLabelFontSizeDelta (from ui::ResourceBundle).

The StyledLabelTests could be fixed updating the tests to use
corresponding gfx::FontLists. However, StyledLabel should have the same
default FontList as views::Label anyway (i.e. not the
default-constructed gfx::FontList(), but one from ui::ResourceBundle).
So fix these by asking a Label for its FontList.

Fixes the following views_unittests on Mac:
    LabelTest.EmptyLabelSizing
    StyledLabelTest.BasicWrapping
    StyledLabelTest.DontBreakLinks
    StyledLabelTest.NoWrapping
    StyledLabelTest.StyledRangeBold
    StyledLabelTest.StyledRangeWithDisabledLineWrapping
    StyledLabelTest.StyledRangeWithTooltip
    StyledLabelTest.WrapLongWords

BUG=564879,579380
==========

[tapted, 2016-03-08 12:25:43]

Hi sky, please take a look

https://codereview.chromium.org/1773063002/diff/40001/ui/views/controls/style...
File ui/views/controls/styled_label.cc (right):

https://codereview.chromium.org/1773063002/diff/40001/ui/views/controls/style...
ui/views/controls/styled_label.cc:102: : font_list_(Label().font_list()),
There's an alternative to this in patchset 2 - which just changes the
unittest.cc rather than styled_label.cc - but I think this is what we want in
the longer term anyway (i.e. Label and StyledLabel default fonts should match).

(also this is a bit more heavyweight than using ResourceBundle directly, but
keeps the relationship with Label more cohesive, and is a similar approach to
e.g. CalculateLineHeight() in the anonymous namespace)

[sky, 2016-03-08 17:13:07]

LGTM

[tapted, 2016-03-08 23:23:00]

The CQ bit was checked by tapted@chromium.org

[commit-bot: I haz the power, 2016-03-08 23:23:28]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1773063002/40001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1773063002/40001

[commit-bot: I haz the power, 2016-03-08 23:55:56]

Description was changed from

==========
MacViews: Fix failing label-related views_unittests after r377477

r377477 Set a more Maccy default font size for labels on Mac.
LabelTest.EmptyLabelSizing tests did not handle a label having a
FontList other than a default-constructed gfx::FontList(). Fix by
comparing against the actual FontList.

A selection of StyledLabelTests were failing because they compare a
StyledLabel containing a default-constructed gfx::FontList() with a
views::Label() containing the gfx::FontList corresponding to
ui::kLabelFontSizeDelta (from ui::ResourceBundle).

The StyledLabelTests could be fixed updating the tests to use
corresponding gfx::FontLists. However, StyledLabel should have the same
default FontList as views::Label anyway (i.e. not the
default-constructed gfx::FontList(), but one from ui::ResourceBundle).
So fix these by asking a Label for its FontList.

Fixes the following views_unittests on Mac:
    LabelTest.EmptyLabelSizing
    StyledLabelTest.BasicWrapping
    StyledLabelTest.DontBreakLinks
    StyledLabelTest.NoWrapping
    StyledLabelTest.StyledRangeBold
    StyledLabelTest.StyledRangeWithDisabledLineWrapping
    StyledLabelTest.StyledRangeWithTooltip
    StyledLabelTest.WrapLongWords

BUG=564879,579380
==========

to

==========
MacViews: Fix failing label-related views_unittests after r377477

r377477 Set a more Maccy default font size for labels on Mac.
LabelTest.EmptyLabelSizing tests did not handle a label having a
FontList other than a default-constructed gfx::FontList(). Fix by
comparing against the actual FontList.

A selection of StyledLabelTests were failing because they compare a
StyledLabel containing a default-constructed gfx::FontList() with a
views::Label() containing the gfx::FontList corresponding to
ui::kLabelFontSizeDelta (from ui::ResourceBundle).

The StyledLabelTests could be fixed updating the tests to use
corresponding gfx::FontLists. However, StyledLabel should have the same
default FontList as views::Label anyway (i.e. not the
default-constructed gfx::FontList(), but one from ui::ResourceBundle).
So fix these by asking a Label for its FontList.

Fixes the following views_unittests on Mac:
    LabelTest.EmptyLabelSizing
    StyledLabelTest.BasicWrapping
    StyledLabelTest.DontBreakLinks
    StyledLabelTest.NoWrapping
    StyledLabelTest.StyledRangeBold
    StyledLabelTest.StyledRangeWithDisabledLineWrapping
    StyledLabelTest.StyledRangeWithTooltip
    StyledLabelTest.WrapLongWords

BUG=564879,579380
==========

[commit-bot: I haz the power, 2016-03-08 23:55:59]

Committed patchset #3 (id:40001)

[commit-bot: I haz the power, 2016-03-08 23:57:45]

Description was changed from

==========
MacViews: Fix failing label-related views_unittests after r377477

r377477 Set a more Maccy default font size for labels on Mac.
LabelTest.EmptyLabelSizing tests did not handle a label having a
FontList other than a default-constructed gfx::FontList(). Fix by
comparing against the actual FontList.

A selection of StyledLabelTests were failing because they compare a
StyledLabel containing a default-constructed gfx::FontList() with a
views::Label() containing the gfx::FontList corresponding to
ui::kLabelFontSizeDelta (from ui::ResourceBundle).

The StyledLabelTests could be fixed updating the tests to use
corresponding gfx::FontLists. However, StyledLabel should have the same
default FontList as views::Label anyway (i.e. not the
default-constructed gfx::FontList(), but one from ui::ResourceBundle).
So fix these by asking a Label for its FontList.

Fixes the following views_unittests on Mac:
    LabelTest.EmptyLabelSizing
    StyledLabelTest.BasicWrapping
    StyledLabelTest.DontBreakLinks
    StyledLabelTest.NoWrapping
    StyledLabelTest.StyledRangeBold
    StyledLabelTest.StyledRangeWithDisabledLineWrapping
    StyledLabelTest.StyledRangeWithTooltip
    StyledLabelTest.WrapLongWords

BUG=564879,579380
==========

to

==========
MacViews: Fix failing label-related views_unittests after r377477

r377477 Set a more Maccy default font size for labels on Mac.
LabelTest.EmptyLabelSizing tests did not handle a label having a
FontList other than a default-constructed gfx::FontList(). Fix by
comparing against the actual FontList.

A selection of StyledLabelTests were failing because they compare a
StyledLabel containing a default-constructed gfx::FontList() with a
views::Label() containing the gfx::FontList corresponding to
ui::kLabelFontSizeDelta (from ui::ResourceBundle).

The StyledLabelTests could be fixed updating the tests to use
corresponding gfx::FontLists. However, StyledLabel should have the same
default FontList as views::Label anyway (i.e. not the
default-constructed gfx::FontList(), but one from ui::ResourceBundle).
So fix these by asking a Label for its FontList.

Fixes the following views_unittests on Mac:
    LabelTest.EmptyLabelSizing
    StyledLabelTest.BasicWrapping
    StyledLabelTest.DontBreakLinks
    StyledLabelTest.NoWrapping
    StyledLabelTest.StyledRangeBold
    StyledLabelTest.StyledRangeWithDisabledLineWrapping
    StyledLabelTest.StyledRangeWithTooltip
    StyledLabelTest.WrapLongWords

BUG=564879,579380

Committed: https://crrev.com/cfb9dbdfb06b03538d859b953b3896c75ed19306
Cr-Commit-Position: refs/heads/master@{#379980}
==========

[commit-bot: I haz the power, 2016-03-08 23:57:46]

Patchset 3 (id:??) landed as
https://crrev.com/cfb9dbdfb06b03538d859b953b3896c75ed19306
Cr-Commit-Position: refs/heads/master@{#379980}