| Index: content/renderer/npapi/webplugin_impl.cc
|
| diff --git a/content/renderer/npapi/webplugin_impl.cc b/content/renderer/npapi/webplugin_impl.cc
|
| index f5b0273fe9ae03a5c394a9d1b75a1f2f71dd158b..7a6b05951137ed7a4ca2d91861d4fffd65c2e8bf 100644
|
| --- a/content/renderer/npapi/webplugin_impl.cc
|
| +++ b/content/renderer/npapi/webplugin_impl.cc
|
| @@ -763,13 +763,6 @@ void WebPluginImpl::URLRedirectResponse(bool allow, int resource_id) {
|
| }
|
| }
|
|
|
| -bool WebPluginImpl::CheckIfRunInsecureContent(const GURL& url) {
|
| - if (!webframe_)
|
| - return true;
|
| -
|
| - return webframe_->checkIfRunInsecureContent(url);
|
| -}
|
| -
|
| #if defined(OS_MACOSX)
|
| WebPluginAcceleratedSurface* WebPluginImpl::GetAcceleratedSurface(
|
| gfx::GpuPreference gpu_preference) {
|
| @@ -858,17 +851,6 @@ void WebPluginImpl::willFollowRedirect(WebURLLoader* loader,
|
| // until kDirectNPAPIRequests is the default and we can remove this old path.
|
| WebPluginImpl::ClientInfo* client_info = GetClientInfoFromLoader(loader);
|
| if (client_info) {
|
| - // Currently this check is just to catch an https -> http redirect when
|
| - // loading the main plugin src URL. Longer term, we could investigate
|
| - // firing mixed diplay or scripting issues for subresource loads
|
| - // initiated by plugins.
|
| - if (client_info->is_plugin_src_load &&
|
| - webframe_ &&
|
| - !webframe_->checkIfRunInsecureContent(new_request.url())) {
|
| - loader->cancel();
|
| - client_info->client->DidFail(client_info->id);
|
| - return;
|
| - }
|
| if (net::HttpResponseHeaders::IsRedirectResponseCode(
|
| response.httpStatusCode())) {
|
| // If the plugin does not participate in url redirect notifications then
|
|
|