summaryrefslogtreecommitdiffstats
path: root/chrome/renderer/chrome_content_renderer_client.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/renderer/chrome_content_renderer_client.cc')
-rw-r--r--chrome/renderer/chrome_content_renderer_client.cc15
1 files changed, 10 insertions, 5 deletions
diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc
index 48bc0a0..ad59ffb 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);