Merge 145885 to 1180 (M21) - PPAPI: Add an API for setting a custom user agent for URL requests.

webkit/plugins/ppapi/ppb_url_request_info_impl.cc

Index: webkit/plugins/ppapi/ppb_url_request_info_impl.cc
===================================================================
--- webkit/plugins/ppapi/ppb_url_request_info_impl.cc	(revision 147912)
+++ webkit/plugins/ppapi/ppb_url_request_info_impl.cc	(working copy)
@@ -113,12 +113,11 @@
     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 @@
   return
       data().has_custom_referrer_url ||
       data().has_custom_content_transfer_encoding ||
+      data().has_custom_user_agent ||
       url_util::FindAndCompareScheme(data().url, "javascript", NULL);
 }