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

Unified Diff: content/common/origin_util.cc

Issue 2228403003: content: Use stl utilities from the base namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased Created 4 years, 4 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 | « content/child/worker_thread_registry.cc ('k') | content/public/test/download_test_observer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/origin_util.cc
diff --git a/content/common/origin_util.cc b/content/common/origin_util.cc
index 275d28f05d9a8eeb3e698feef3516475a20c8718..11873d63cfd9de6f8b7b2c4592d785abef089e42 100644
--- a/content/common/origin_util.cc
+++ b/content/common/origin_util.cc
@@ -62,11 +62,12 @@ bool IsOriginSecure(const GURL& url) {
if (net::IsLocalhost(hostname))
return true;
- if (ContainsKey(g_trustworthy_whitelist.Get().secure_schemes(), url.scheme()))
+ if (base::ContainsKey(g_trustworthy_whitelist.Get().secure_schemes(),
+ url.scheme()))
return true;
- if (ContainsKey(g_trustworthy_whitelist.Get().secure_origins(),
- url.GetOrigin())) {
+ if (base::ContainsKey(g_trustworthy_whitelist.Get().secure_origins(),
+ url.GetOrigin())) {
return true;
}
@@ -77,8 +78,8 @@ bool OriginCanAccessServiceWorkers(const GURL& url) {
if (url.SchemeIsHTTPOrHTTPS() && IsOriginSecure(url))
return true;
- if (ContainsKey(g_trustworthy_whitelist.Get().service_worker_schemes(),
- url.scheme())) {
+ if (base::ContainsKey(g_trustworthy_whitelist.Get().service_worker_schemes(),
+ url.scheme())) {
return true;
}
« no previous file with comments | « content/child/worker_thread_registry.cc ('k') | content/public/test/download_test_observer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698