Skip to content

Commit

Permalink
Revert "Add NSAllowsArbitraryLoadsInWebContent Info plist key"
Browse files Browse the repository at this point in the history
This reverts commit 12ac640.

Reason for revert: introduces crbug.com/745945

Original change's description:
> Add NSAllowsArbitraryLoadsInWebContent Info plist key
>
> The old NSAllowsArbitraryLoads key is still required for backwards
> compatibility when running on old iOS versions.
>
> EarlGrey test targets need to download insecure images from
> browsingtest.appspot.com so add it as an exception domain in
> EarlGreyAddition+Info.plist.
>
> Bug: 622747
> Change-Id: Ide26330939035cd8a876612dc659c48a6e2bd9fc
> Reviewed-on: https://chromium-review.googlesource.com/568791
> Reviewed-by: Eugene But <[email protected]>
> Commit-Queue: Mike Dougherty <[email protected]>
> Cr-Commit-Position: refs/heads/master@{#486376}

[email protected], [email protected]


(cherry picked from commit f0b26ec)

Bug: 622747
Change-Id: If3b5cb105118d301fba67ef9b1d4c46859399022
Reviewed-on: https://chromium-review.googlesource.com/580524
Reviewed-by: Eugene But <[email protected]>
Commit-Queue: Eugene But <[email protected]>
Cr-Original-Commit-Position: refs/heads/master@{#488561}
Reviewed-on: https://chromium-review.googlesource.com/586968
Cr-Commit-Position: refs/branch-heads/3163@{#58}
Cr-Branched-From: ff259ba-refs/heads/master@{#488528}
  • Loading branch information
Eugene But authored and Eugene But committed Jul 26, 2017
1 parent a6bfef3 commit f1f68ba
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 15 deletions.
13 changes: 0 additions & 13 deletions ios/chrome/app/resources/EarlGreyAddition+Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,5 @@
<string>${EG_MAIN_APPLICATION_DELEGATE}</string>
<key>UIFileSharingEnabled</key>
<true/>
<key>NSAppTransportSecurity</key>
<dict>
<key>NSExceptionDomains</key>
<dict>
<key>browsingtest.appspot.com</key>
<dict>
<key>NSExceptionAllowsInsecureHTTPLoads</key>
<true/>
<key>NSIncludesSubdomains</key>
<true/>
</dict>
</dict>
</dict>
</dict>
</plist>
2 changes: 0 additions & 2 deletions ios/chrome/app/resources/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,6 @@
<dict>
<key>NSAllowsArbitraryLoads</key>
<true/>
<key>NSAllowsArbitraryLoadsInWebContent</key>
<true/>
</dict>
<key>NSUserActivityTypes</key>
<array>
Expand Down

0 comments on commit f1f68ba

Please sign in to comment.