Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(174)

Unified Diff: net/cookies/cookie_util.cc

Issue 895853003: Update from https://crrev.com/314320 (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/cookies/cookie_store_unittest.h ('k') | net/cookies/cookie_util_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/cookies/cookie_util.cc
diff --git a/net/cookies/cookie_util.cc b/net/cookies/cookie_util.cc
index 075ad73c4fcdf3ed36e2c079f835137df025afa8..9ad6eaa7d20eba3edb847fe4b1809bb7a18e9f08 100644
--- a/net/cookies/cookie_util.cc
+++ b/net/cookies/cookie_util.cc
@@ -24,7 +24,8 @@ bool DomainIsHostOnly(const std::string& domain_string) {
std::string GetEffectiveDomain(const std::string& scheme,
const std::string& host) {
- if (scheme == "http" || scheme == "https") {
+ if (scheme == "http" || scheme == "https" || scheme == "ws" ||
+ scheme == "wss") {
return registry_controlled_domains::GetDomainAndRegistry(
host,
registry_controlled_domains::INCLUDE_PRIVATE_REGISTRIES);
@@ -265,6 +266,5 @@ std::string SerializeRequestCookieLine(
return buffer;
}
-} // namespace cookie_utils
+} // namespace cookie_util
} // namespace net
-
« no previous file with comments | « net/cookies/cookie_store_unittest.h ('k') | net/cookies/cookie_util_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698