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 28164166aa42e47db4cd605fd3e50273bcd6b775..8e92dfcea4547c48ee1f72f33511004d7957dc43 100644 |
--- a/chrome/renderer/chrome_content_renderer_client.cc |
+++ b/chrome/renderer/chrome_content_renderer_client.cc |
@@ -1023,8 +1023,7 @@ bool ChromeContentRendererClient::IsNaClAllowed( |
bool is_photo_app = |
// Whitelisted apps must be served over https. |
- app_url.SchemeIs("https") && |
- manifest_url.SchemeIs("https") && |
+ app_url.SchemeIsCryptographic() && manifest_url.SchemeIsCryptographic() && |
(EndsWith(app_url_host, "plus.google.com", false) || |
EndsWith(app_url_host, "plus.sandbox.google.com", false)) && |
manifest_url.DomainIs("ssl.gstatic.com") && |
@@ -1037,9 +1036,8 @@ bool ChromeContentRendererClient::IsNaClAllowed( |
} |
bool is_hangouts_app = |
// Whitelisted apps must be served over secure scheme. |
- app_url.SchemeIs("https") && |
- manifest_url.SchemeIsSecure() && |
- manifest_url.SchemeIsFileSystem() && |
+ app_url.SchemeIsCryptographic() && manifest_url.SchemeIsFileSystem() && |
+ manifest_url.inner_url()->SchemeIsCryptographic() && |
(EndsWith(app_url_host, "talkgadget.google.com", false) || |
EndsWith(app_url_host, "plus.google.com", false) || |
EndsWith(app_url_host, "plus.sandbox.google.com", false)) && |