Index: webkit/plugins/ppapi/ppb_url_request_info_impl.cc |
diff --git a/webkit/plugins/ppapi/ppb_url_request_info_impl.cc b/webkit/plugins/ppapi/ppb_url_request_info_impl.cc |
index 79c09bdf08755c2981d05329e4d79ad409acc19b..55c6d3ac1fcaac0663b5986e23e31bdb09b3daf2 100644 |
--- a/webkit/plugins/ppapi/ppb_url_request_info_impl.cc |
+++ b/webkit/plugins/ppapi/ppb_url_request_info_impl.cc |
@@ -113,12 +113,11 @@ bool PPB_URLRequestInfo_Impl::ToWebURLRequest(WebFrame* frame, |
frame->setReferrerForRequest(*dest, GURL(data().custom_referrer_url)); |
} |
- if (data().has_custom_content_transfer_encoding) { |
- if (!data().custom_content_transfer_encoding.empty()) { |
- dest->addHTTPHeaderField( |
- WebString::fromUTF8("Content-Transfer-Encoding"), |
- WebString::fromUTF8(data().custom_content_transfer_encoding)); |
- } |
+ if (data().has_custom_content_transfer_encoding && |
+ !data().custom_content_transfer_encoding.empty()) { |
+ dest->addHTTPHeaderField( |
+ WebString::fromUTF8("Content-Transfer-Encoding"), |
+ WebString::fromUTF8(data().custom_content_transfer_encoding)); |
} |
return true; |
@@ -128,6 +127,7 @@ bool PPB_URLRequestInfo_Impl::RequiresUniversalAccess() const { |
return |
data().has_custom_referrer_url || |
data().has_custom_content_transfer_encoding || |
+ data().has_custom_user_agent || |
url_util::FindAndCompareScheme(data().url, "javascript", NULL); |
} |