bff801a9453d809e5bef371c03f25f9264307929 - chromium/src.git

commit	bff801a9453d809e5bef371c03f25f9264307929	[log] [tgz]
author	Kinuko Yasuda <kinuko@chromium.org>	Wed May 20 09:14:52 2015
committer	Kinuko Yasuda <kinuko@chromium.org>	Wed May 20 09:16:24 2015
tree	7442340a532d4e07d6ef3bd34e2e90f18b3197b1
parent	f34d46fd2538315164c49db50e84c76e7f1d07b9 [diff]

Merge: Fix typo in --unsafely-treat-insecure-origin-as-secure

'unsafety' must be 'unsafely', apparently.

BUG=441605
TBR=thestig

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

Cr-Commit-Position: refs/heads/master@{#330404}
(cherry picked from commit 722bc522935f02c4c481e10d926e3321a509bab8)

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

Cr-Commit-Position: refs/branch-heads/2403@{#29}
Cr-Branched-From: f54b8097a9c45ed4ad308133d49f05325d6c5070-refs/heads/master@{#330231}

chrome/browser/chrome_content_browser_client.cc[diff]
chrome/browser/ui/startup/bad_flags_prompt.cc[diff]
chrome/common/chrome_switches.cc[diff]
chrome/common/chrome_switches.h[diff]
chrome/common/secure_origin_whitelist.cc[diff]
chrome/common/secure_origin_whitelist.h[diff]
chrome/common/secure_origin_whitelist_unittest.cc[diff]

7 files changed