Merge 171259

Merge 171259
> Merge 169678
> > [Mac] Website settings: Enlarge window when permission strings are too long.
> > 
> > The website settings window was using a fixed width. This was fine for most
> > text since it would wrap, but the permissions can't wrap, so the window should
> > be made wide enough to fit the largest permission string.
> > 
> > BUG=159156
> > 
> > Review URL: https://codereview.chromium.org/11417082
> 
> TBR=dubroy@chromium.org
> Review URL: https://codereview.chromium.org/11445020

TBR=markusheintz@chromium.org
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=172030