Cherry-pick r291100 "Amend 289844 "Simplify android_webview wrap_contents mode."
Cherry-pick r291100 "Amend 289844 "Simplify android_webview wrap_contents mode."

> Amend 289844 "Simplify android_webview wrap_contents mode."
>
> When merging r288992 I accidentally omitted the one line from
> web_preferences due to a conflicting rename of that file in trunk.
> This CL fixes the mistake.
>
> BUG=392460
> TBR=mkosiba@chromium.org
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=291100

BUG: 15281050

SOKP/external_chromium_org,CyanogenMod/android_external_chromium_org,Fusion-Rom/android_external_chromium_org,SlimRoms/android_external_chromium_org,AICP/external_chromium_org,Fusion-Rom/android_external_chromium_org,sudosurootdev/external_chromium_org,Plain-Andy-legacy/android_external_chromium_org,Omegaphora/external_chromium_org,AndroidOpenDevelopment/android_external_chromium_org,TeamTwisted/external_chromium_org,OptiPop/external_chromium_org,TeamExodus/external_chromium_org,Omegaphora/external_chromium_org,android-ia/platform_external_chromium_org,GladeRom/android_external_chromium_org,android-ia/platform_external_chromium_org,jgcaaprom/android_external_chromium_org,FusionSP/android_external_chromium_org,OptiPop/external_chromium_org,jgcaaprom/android_external_chromium_org,omnirom/android_external_chromium-org,laperry1/android_external_chromium_org,mydongistiny/external_chromium_org,jgcaaprom/android_external_chromium_org,TeamTwisted/external_chromium_org,DARKPOP/external_chromium_org,TeamEOS/external_chromium_org,AICP/external_chromium_org,TeamEOS/external_chromium_org,TeslaProject/external_chromium_org,FusionSP/android_external_chromium_org,SlimRemix/android_external_chromium_org,DirtyUnicorns/android_external_chromium_org,CyanogenMod/android_external_chromium_org,AICP/external_chromium_org,TeamTwisted/external_chromium_org,AOSPU/external_chromium_org,SlimRoms/android_external_chromium_org,SlimRoms/android_external_chromium_org,TeamEOS/external_chromium_org,TeamExodus/external_chromium_org,GladeRom/android_external_chromium_org,OptiPop/external_chromium_org,DARKPOP/external_chromium_org,OptiPop/external_chromium_org,byterom/android_external_chromium_org,mydongistiny/external_chromium_org,Fusion-Rom/android_external_chromium_org,sudosurootdev/external_chromium_org,geekboxzone/lollipop_external_chromium_org,AOSPU/external_chromium_org,Omegaphora/external_chromium_org,FusionSP/android_external_chromium_org,laperry1/android_external_chromium_org,SlimRemix/android_external_chromium_org,laperry1/android_external_chromium_org,GladeRom/android_external_chromium_org,DirtyUnicorns/android_external_chromium_org,sudosurootdev/external_chromium_org,byterom/android_external_chromium_org,byterom/android_external_chromium_org,xsynergy510x/android_external_chromium_org,Fusion-Rom/android_external_chromium_org,AICP/external_chromium_org,geekboxzone/lollipop_external_chromium_org,TeamTwisted/external_chromium_org,AOSPU/external_chromium_org,TeamExodus/external_chromium_org,Omegaphora/external_chromium_org,AOSPU/external_chromium_org,byterom/android_external_chromium_org,OptiPop/external_chromium_org,Plain-Andy-legacy/android_external_chromium_org,DARKPOP/external_chromium_org,AOSPU/external_chromium_org,AndroidOpenDevelopment/android_external_chromium_org,Fusion-Rom/android_external_chromium_org,OptiPop/external_chromium_org,android-ia/platform_external_chromium_org,TeamEOS/external_chromium_org,DARKPOP/external_chromium_org,xsynergy510x/android_external_chromium_org,CyanogenMod/android_external_chromium_org,SOKP/external_chromium_org,xsynergy510x/android_external_chromium_org,DirtyUnicorns/android_external_chromium_org,android-ia/platform_external_chromium_org,jgcaaprom/android_external_chromium_org,geekboxzone/lollipop_external_chromium_org,AndroidOpenDevelopment/android_external_chromium_org,android-ia/platform_external_chromium_org,Plain-Andy-legacy/android_external_chromium_org,AndroidOpenDevelopment/android_external_chromium_org,CyanogenMod/android_external_chromium_org,SlimRemix/android_external_chromium_org,TeslaProject/external_chromium_org,SlimRemix/android_external_chromium_org,Fusion-Rom/android_external_chromium_org,geekboxzone/lollipop_external_chromium_org,AndroidOpenDevelopment/android_external_chromium_org,TeslaProject/external_chromium_org,sudosurootdev/external_chromium_org,laperry1/android_external_chromium_org,SOKP/external_chromium_org,byterom/android_external_chromium_org,mydongistiny/external_chromium_org,SOKP/external_chromium_org,AOSPU/external_chromium_org,GladeRom/android_external_chromium_org,Omegaphora/external_chromium_org,SOKP/external_chromium_org,Plain-Andy-legacy/android_external_chromium_org,SlimRoms/android_external_chromium_org,sudosurootdev/external_chromium_org,laperry1/android_external_chromium_org,TeamEOS/external_chromium_org,GladeRom/android_external_chromium_org,Plain-Andy-legacy/android_external_chromium_org,Omegaphora/external_chromium_org,jgcaaprom/android_external_chromium_org,CyanogenMod/android_external_chromium_org,TeslaProject/external_chromium_org,TeamExodus/external_chromium_org,TeamTwisted/external_chromium_org,laperry1/android_external_chromium_org,TeamEOS/external_chromium_org,DARKPOP/external_chromium_org,TeamTwisted/external_chromium_org,TeslaProject/external_chromium_org,Fusion-Rom/android_external_chromium_org,TeamExodus/external_chromium_org,CyanogenMod/android_external_chromium_org,CyanogenMod/android_external_chromium_org,CyanogenMod/android_external_chromium_org,DARKPOP/external_chromium_org,DirtyUnicorns/android_external_chromium_org,SOKP/external_chromium_org,xsynergy510x/android_external_chromium_org,GladeRom/android_external_chromium_org,omnirom/android_external_chromium-org,FusionSP/android_external_chromium_org,omnirom/android_external_chromium-org,GladeRom/android_external_chromium_org,GladeRom/android_external_chromium_org,sudosurootdev/external_chromium_org,mydongistiny/external_chromium_org,AICP/external_chromium_org,DirtyUnicorns/android_external_chromium_org,AOSPU/external_chromium_org,AndroidOpenDevelopment/android_external_chromium_org,omnirom/android_external_chromium-org,FusionSP/android_external_chromium_org,geekboxzone/lollipop_external_chromium_org,mydongistiny/external_chromium_org,laperry1/android_external_chromium_org,DirtyUnicorns/android_external_chromium_org,Plain-Andy-legacy/android_external_chromium_org,FusionSP/android_external_chromium_org,GladeRom/android_external_chromium_org,SlimRemix/android_external_chromium_org,android-ia/platform_external_chromium_org,mydongistiny/external_chromium_org,SlimRoms/android_external_chromium_org,TeamEOS/external_chromium_org,xsynergy510x/android_external_chromium_org,Plain-Andy-legacy/android_external_chromium_org,laperry1/android_external_chromium_org,FusionSP/android_external_chromium_org,omnirom/android_external_chromium-org,xsynergy510x/android_external_chromium_org,SlimRoms/android_external_chromium_org,SOKP/external_chromium_org,DirtyUnicorns/android_external_chromium_org,SlimRemix/android_external_chromium_org,SlimRemix/android_external_chromium_org,AICP/external_chromium_org,android-ia/platform_external_chromium_org,geekboxzone/lollipop_external_chromium_org,TeamEOS/external_chromium_org,OptiPop/external_chromium_org,DARKPOP/external_chromium_org,laperry1/android_external_chromium_org,OptiPop/external_chromium_org,Omegaphora/external_chromium_org,SOKP/external_chromium_org,SlimRemix/android_external_chromium_org,byterom/android_external_chromium_org,jgcaaprom/android_external_chromium_org,TeslaProject/external_chromium_org,AndroidOpenDevelopment/android_external_chromium_org,TeamExodus/external_chromium_org,FusionSP/android_external_chromium_org,FusionSP/android_external_chromium_org,byterom/android_external_chromium_org,mydongistiny/external_chromium_org,android-ia/platform_external_chromium_org,android-ia/platform_external_chromium_org,sudosurootdev/external_chromium_org,byterom/android_external_chromium_org,TeamExodus/external_chromium_org,DARKPOP/external_chromium_org,xsynergy510x/android_external_chromium_org,DirtyUnicorns/android_external_chromium_org,GladeRom/android_external_chromium_org,TeslaProject/external_chromium_org,TeslaProject/external_chromium_org,Fusion-Rom/android_external_chromium_org,Fusion-Rom/android_external_chromium_org,OptiPop/external_chromium_org,geekboxzone/lollipop_external_chromium_org,TeamEOS/external_chromium_org,Plain-Andy-legacy/android_external_chromium_org,jgcaaprom/android_external_chromium_org,xsynergy510x/android_external_chromium_org,DirtyUnicorns/android_external_chromium_org,TeamTwisted/external_chromium_org,Omegaphora/external_chromium_org,Omegaphora/external_chromium_org,omnirom/android_external_chromium-org,AICP/external_chromium_org,Fusion-Rom/android_external_chromium_org,FusionSP/android_external_chromium_org,SOKP/external_chromium_org,mydongistiny/external_chromium_org,geekboxzone/lollipop_external_chromium_org,android-ia/platform_external_chromium_org,AICP/external_chromium_org,SlimRoms/android_external_chromium_org,omnirom/android_external_chromium-org,jgcaaprom/android_external_chromium_org,laperry1/android_external_chromium_org,geekboxzone/lollipop_external_chromium_org,SlimRemix/android_external_chromium_org,TeamTwisted/external_chromium_org,SlimRoms/android_external_chromium_org,jgcaaprom/android_external_chromium_org,jgcaaprom/android_external_chromium_org,TeamExodus/external_chromium_org,TeamTwisted/external_chromium_org,geekboxzone/lollipop_external_chromium_org,DARKPOP/external_chromium_org,AndroidOpenDevelopment/android_external_chromium_org,OptiPop/external_chromium_org,CyanogenMod/android_external_chromium_org,TeslaProject/external_chromium_org,Omegaphora/external_chromium_org,mydongistiny/external_chromium_org,xsynergy510x/android_external_chromium_org,SOKP/external_chromium_org,DirtyUnicorns/android_external_chromium_org,xsynergy510x/android_external_chromium_org,byterom/android_external_chromium_org,TeamTwisted/external_chromium_org,DARKPOP/external_chromium_org,sudosurootdev/external_chromium_org,mydongistiny/external_chromium_org,TeamExodus/external_chromium_org,TeslaProject/external_chromium_org,Plain-Andy-legacy/android_external_chromium_org,SlimRemix/android_external_chromium_org,TeamExodus/external_chromium_org,omnirom/android_external_chromium-org,byterom/android_external_chromium_org,sudosurootdev/external_chromium_org,Plain-Andy-legacy/android_external_chromium_org,sudosurootdev/external_chromium_org,AOSPU/external_chromium_org