| 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 0c254e7f57e32c5dc5d1c050cd71bba748d47754..407102a341d613317ce146db3c212b741172cf24 100644
|
| --- a/chrome/renderer/chrome_content_renderer_client.cc
|
| +++ b/chrome/renderer/chrome_content_renderer_client.cc
|
| @@ -1035,8 +1035,7 @@ bool ChromeContentRendererClient::IsNaClAllowed(
|
| }
|
| bool is_hangouts_app =
|
| // Whitelisted apps must be served over secure scheme.
|
| - app_url.SchemeIs("https") &&
|
| - manifest_url.SchemeIsSecure() &&
|
| + app_url.SchemeIs("https") && manifest_url.SchemeIsCryptographic() &&
|
| manifest_url.SchemeIsFileSystem() &&
|
| (EndsWith(app_url_host, "talkgadget.google.com", false) ||
|
| EndsWith(app_url_host, "plus.google.com", false) ||
|
|
|