tree c7cbbb2339862f197d18f25ed7a43b47d89a8a89
parent 63e12a781ddba72a87dcbb2e088e64e0624114c2
author ningxin.hu <ningxin.hu@intel.com> 1422263457 -0800
committer Torne (Richard Coles) <torne@google.com> 1423481716 +0000

Cherrypick "Allow universal access from file if flag is set and url is file scheme."

Fixes a crash in apps using
WebSettings.setAllowUniversalAccessFromFileURLs(true).

> BUG=449075
> TEST=content_unittests --gtest_filter=NavigationControllerTest.IsInPageNavigation
>
> Review URL: https://codereview.chromium.org/855883002
>
> Cr-Commit-Position: refs/heads/master@{#313051}

Change-Id: I7360997ae6eec0279c932be555bfcb097e2804a7