rAc: don't put a street-line2 after a short street-line1.

R=rouslan@chromium.org
BUG=334456
TEST=unit_tests

Review URL: https://codereview.chromium.org/133683008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244975 0039d316-1c4b-4281-b951-d872f2087c98
SVN changes up to revision 244975
Clean up some mistaken test logic (--enable-autofill-address-i18n doesn't matter
to i18ninput::*).

R=estade@chromium.org
BUG=none
TEST=better tests

Review URL: https://codereview.chromium.org/137563003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244976 0039d316-1c4b-4281-b951-d872f2087c98
SVN changes up to revision 244976