diff options
author | kinuko <kinuko@chromium.org> | 2015-05-18 13:40:59 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-05-18 20:41:30 +0000 |
commit | 722bc522935f02c4c481e10d926e3321a509bab8 (patch) | |
tree | 789625f1696db2af4516f847c8ad365381020214 | |
parent | 1915812cee80233d5a0743c2c13f37b217355306 (diff) | |
download | chromium_src-722bc522935f02c4c481e10d926e3321a509bab8.zip chromium_src-722bc522935f02c4c481e10d926e3321a509bab8.tar.gz chromium_src-722bc522935f02c4c481e10d926e3321a509bab8.tar.bz2 |
Fix typo in --unsafely-treat-insecure-origin-as-secure
'unsafety' must be 'unsafely', apparently.
BUG=441605
Review URL: https://codereview.chromium.org/1124173007
Cr-Commit-Position: refs/heads/master@{#330404}
-rw-r--r-- | chrome/browser/chrome_content_browser_client.cc | 2 | ||||
-rw-r--r-- | chrome/browser/ui/startup/bad_flags_prompt.cc | 2 | ||||
-rw-r--r-- | chrome/common/chrome_switches.cc | 6 | ||||
-rw-r--r-- | chrome/common/chrome_switches.h | 2 | ||||
-rw-r--r-- | chrome/common/secure_origin_whitelist.cc | 6 | ||||
-rw-r--r-- | chrome/common/secure_origin_whitelist.h | 2 | ||||
-rw-r--r-- | chrome/common/secure_origin_whitelist_unittest.cc | 4 |
7 files changed, 12 insertions, 12 deletions
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc index e0e9bb9..e07ea7a 100644 --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc @@ -1387,7 +1387,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches( switches::kProfilingAtStart, switches::kProfilingFile, switches::kProfilingFlush, - switches::kUnsafetyTreatInsecureOriginAsSecure, + switches::kUnsafelyTreatInsecureOriginAsSecure, translate::switches::kTranslateSecurityOrigin, }; diff --git a/chrome/browser/ui/startup/bad_flags_prompt.cc b/chrome/browser/ui/startup/bad_flags_prompt.cc index 69ab658..7877454 100644 --- a/chrome/browser/ui/startup/bad_flags_prompt.cc +++ b/chrome/browser/ui/startup/bad_flags_prompt.cc @@ -82,7 +82,7 @@ void ShowBadFlagsPrompt(Browser* browser) { // This flag allows people to whitelist certain origins as secure, even // if they are not. - switches::kUnsafetyTreatInsecureOriginAsSecure, + switches::kUnsafelyTreatInsecureOriginAsSecure, NULL }; diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc index 86f222f..01a0b3e 100644 --- a/chrome/common/chrome_switches.cc +++ b/chrome/common/chrome_switches.cc @@ -1101,10 +1101,10 @@ const char kUnlimitedStorage[] = "unlimited-storage"; // Treat given (insecure) origins as secure origins. Multiple origins can be // supplied. Has no effect unless --user-data-dir is also supplied. // Example: -// --unsafety-treat-insecure-origin-as-secure=http://a.test,http://b.test +// --unsafely-treat-insecure-origin-as-secure=http://a.test,http://b.test // --user-data-dir=/test/only/profile/dir -const char kUnsafetyTreatInsecureOriginAsSecure[] = - "unsafety-treat-insecure-origin-as-secure"; +const char kUnsafelyTreatInsecureOriginAsSecure[] = + "unsafely-treat-insecure-origin-as-secure"; // Uses Spdy for the transport protocol instead of HTTP. This is a temporary // testing flag. diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h index 0af2b1b..c33c943 100644 --- a/chrome/common/chrome_switches.h +++ b/chrome/common/chrome_switches.h @@ -301,7 +301,7 @@ extern const char kTestName[]; extern const char kTrustedSpdyProxy[]; extern const char kTryChromeAgain[]; extern const char kUnlimitedStorage[]; -extern const char kUnsafetyTreatInsecureOriginAsSecure[]; +extern const char kUnsafelyTreatInsecureOriginAsSecure[]; extern const char kUseSimpleCacheBackend[]; extern const char kUseSpdy[]; extern const char kUserAgent[]; diff --git a/chrome/common/secure_origin_whitelist.cc b/chrome/common/secure_origin_whitelist.cc index f595857..d8294a4 100644 --- a/chrome/common/secure_origin_whitelist.cc +++ b/chrome/common/secure_origin_whitelist.cc @@ -11,16 +11,16 @@ #include "chrome/common/chrome_switches.h" void GetSecureOriginWhitelist(std::set<GURL>* origins) { - // If kUnsafetyTreatInsecureOriginAsSecure option is given and + // If kUnsafelyTreatInsecureOriginAsSecure option is given and // kUserDataDir is present, add the given origins as trustworthy // for whitelisting. const base::CommandLine& command_line = *base::CommandLine::ForCurrentProcess(); - if (command_line.HasSwitch(switches::kUnsafetyTreatInsecureOriginAsSecure) && + if (command_line.HasSwitch(switches::kUnsafelyTreatInsecureOriginAsSecure) && command_line.HasSwitch(switches::kUserDataDir)) { std::vector<std::string> given_origins; base::SplitString(command_line.GetSwitchValueASCII( - switches::kUnsafetyTreatInsecureOriginAsSecure), ',', &given_origins); + switches::kUnsafelyTreatInsecureOriginAsSecure), ',', &given_origins); for (const auto& origin : given_origins) origins->insert(GURL(origin)); } diff --git a/chrome/common/secure_origin_whitelist.h b/chrome/common/secure_origin_whitelist.h index 8cd956e..5b29a03 100644 --- a/chrome/common/secure_origin_whitelist.h +++ b/chrome/common/secure_origin_whitelist.h @@ -10,7 +10,7 @@ #include "url/gurl.h" // Returns whitelisted origins that need to be considered trustworthy. -// The whitelist is given by kUnsafetyTreatInsecureOriginAsSecure +// The whitelist is given by kUnsafelyTreatInsecureOriginAsSecure // command-line option. // See https://www.w3.org/TR/powerful-features/#is-origin-trustworthy. void GetSecureOriginWhitelist(std::set<GURL>* origins); diff --git a/chrome/common/secure_origin_whitelist_unittest.cc b/chrome/common/secure_origin_whitelist_unittest.cc index b685711..65865ef 100644 --- a/chrome/common/secure_origin_whitelist_unittest.cc +++ b/chrome/common/secure_origin_whitelist_unittest.cc @@ -12,7 +12,7 @@ using content::IsOriginSecure; namespace chrome { -TEST(SecureOriginWhiteList, UnsafetyTreatInsecureOriginAsSecure) { +TEST(SecureOriginWhiteList, UnsafelyTreatInsecureOriginAsSecure) { EXPECT_FALSE(content::IsOriginSecure(GURL("http://example.com/a.html"))); EXPECT_FALSE( content::IsOriginSecure(GURL("http://127.example.com/a.html"))); @@ -23,7 +23,7 @@ TEST(SecureOriginWhiteList, UnsafetyTreatInsecureOriginAsSecure) { // ChromeContentClient::AddSecureSchemesAndOrigins) base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); command_line->AppendSwitchASCII( - switches::kUnsafetyTreatInsecureOriginAsSecure, + switches::kUnsafelyTreatInsecureOriginAsSecure, "http://example.com,http://127.example.com"); command_line->AppendSwitch(switches::kUserDataDir); content::ResetSecureSchemesAndOriginsForTesting(); |