Merge 2924: Fix 'hyphens: auto' to work only when line wrapping is allowed

Merge 2924: Fix 'hyphens: auto' to work only when line wrapping is allowed

This patch fixes 'hyphens: auto' to work only when line wrapping is
allowed.

BUG=678356
Review-Url: https://codereview.chromium.org/2614743004
Cr-Commit-Position: refs/heads/master@{#441805}
(cherry picked from commit 6715bcb1960f4062e2f6daf261e3da76c7d62019)

Review-Url: https://codereview.chromium.org/2621563002 .
Cr-Commit-Position: refs/branch-heads/2924@{#699}
Cr-Branched-From: 3a87aecc31cd1ffe751dd72c04e5a96a1fc8108a-refs/heads/master@{#433059}
Committed: https://chromium.googlesource.com/chromium/src/+/c27f019ad0ef6a03af5162627a4b40395f95dd7f

[kojii, 2017-01-09 07:50:59]

Description was changed from

==========
Merge 2924: Fix 'hyphens: auto' to work only when line wrapping is allowed

This patch fixes 'hyphens: auto' to work only when line wrapping is
allowed.

BUG=678356

Review-Url: https://codereview.chromium.org/2614743004
Cr-Commit-Position: refs/heads/master@{#441805}
(cherry picked from commit 6715bcb1960f4062e2f6daf261e3da76c7d62019)
==========

to

==========
Merge 2924: Fix 'hyphens: auto' to work only when line wrapping is allowed

This patch fixes 'hyphens: auto' to work only when line wrapping is
allowed.

BUG=678356

Review-Url: https://codereview.chromium.org/2614743004
Cr-Commit-Position: refs/heads/master@{#441805}
(cherry picked from commit 6715bcb1960f4062e2f6daf261e3da76c7d62019)

Review-Url: https://codereview.chromium.org/2621563002 .
Cr-Commit-Position: refs/branch-heads/2924@{#699}
Cr-Branched-From:
3a87aecc31cd1ffe751dd72c04e5a96a1fc8108a-refs/heads/master@{#433059}
Committed:
https://chromium.googlesource.com/chromium/src/+/c27f019ad0ef6a03af5162627a4b...
==========

[kojii, 2017-01-09 07:51:01]

Committed patchset #1 (id:1) manually as
c27f019ad0ef6a03af5162627a4b40395f95dd7f.