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

Unified Diff: chrome/renderer/chrome_content_renderer_client.cc

Issue 1233043003: Remove some legacy versions of StartsWith and EndsWith. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 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 | « chrome/installer/util/shell_util.cc ('k') | cloud_print/service/win/service_utils.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/chrome_content_renderer_client.cc
diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc
index 48bc0a03a8d6c08e0b4d839a8606e632ac7071c1..ad59ffb0853a06d4366cfa7e54cf708d3a3b0e28 100644
--- a/chrome/renderer/chrome_content_renderer_client.cc
+++ b/chrome/renderer/chrome_content_renderer_client.cc
@@ -1007,8 +1007,10 @@ bool ChromeContentRendererClient::IsNaClAllowed(
bool is_photo_app =
// Whitelisted apps must be served over https.
app_url.SchemeIsCryptographic() && manifest_url.SchemeIsCryptographic() &&
- (base::EndsWith(app_url_host, "plus.google.com", false) ||
- base::EndsWith(app_url_host, "plus.sandbox.google.com", false)) &&
+ (base::EndsWith(app_url_host, "plus.google.com",
+ base::CompareCase::INSENSITIVE_ASCII) ||
+ base::EndsWith(app_url_host, "plus.sandbox.google.com",
+ base::CompareCase::INSENSITIVE_ASCII)) &&
manifest_url.DomainIs("ssl.gstatic.com") &&
(manifest_url_path.find("s2/oz/nacl/") == 1 ||
manifest_url_path.find("photos/nacl/") == 1);
@@ -1021,9 +1023,12 @@ bool ChromeContentRendererClient::IsNaClAllowed(
// Whitelisted apps must be served over secure scheme.
app_url.SchemeIsCryptographic() && manifest_url.SchemeIsFileSystem() &&
manifest_url.inner_url()->SchemeIsCryptographic() &&
- (base::EndsWith(app_url_host, "talkgadget.google.com", false) ||
- base::EndsWith(app_url_host, "plus.google.com", false) ||
- base::EndsWith(app_url_host, "plus.sandbox.google.com", false)) &&
+ (base::EndsWith(app_url_host, "talkgadget.google.com",
+ base::CompareCase::INSENSITIVE_ASCII) ||
+ base::EndsWith(app_url_host, "plus.google.com",
+ base::CompareCase::INSENSITIVE_ASCII) ||
+ base::EndsWith(app_url_host, "plus.sandbox.google.com",
+ base::CompareCase::INSENSITIVE_ASCII)) &&
// The manifest must be loaded from the host's FileSystem.
(manifest_fs_host == app_url_host);
« no previous file with comments | « chrome/installer/util/shell_util.cc ('k') | cloud_print/service/win/service_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698