Merge 147060 to 1180 (M21) - PPAPI (Flash): Properly honor Pepper url requests with custom user age…

webkit/plugins/ppapi/ppb_url_request_info_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/plugins/ppapi/ppb_url_request_info_impl.h"
 
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "googleurl/src/gurl.h"
 #include "googleurl/src/url_util.h"
 #include "net/http/http_util.h"
 #include "ppapi/shared_impl/var.h"
 #include "ppapi/thunk/enter.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebData.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebHTTPBody.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLRequest.h"
 #include "webkit/glue/webkit_glue.h"
+#include "webkit/glue/weburlrequest_extradata_impl.h"
 #include "webkit/plugins/ppapi/common.h"
 #include "webkit/plugins/ppapi/plugin_module.h"
 #include "webkit/plugins/ppapi/ppb_file_ref_impl.h"
 #include "webkit/plugins/ppapi/ppb_file_system_impl.h"
 #include "webkit/plugins/ppapi/resource_helper.h"
 
 using ppapi::PPB_URLRequestInfo_Data;
 using ppapi::Resource;
 using ppapi::thunk::EnterResourceNoLock;
 using ppapi::thunk::PPB_FileRef_API;
@@ skipping 83 matching lines @@
   }
 
   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));
   }
 
   if (data().has_custom_user_agent) {
-    // TODO(viettrungluu): If |custom_user_agent| is empty, we're supposed to
-    // arrange for User-Agent to be omitted; this probably won't do that.
-    dest->addHTTPHeaderField(WebString::fromUTF8("User-Agent"),
-                             WebString::fromUTF8(data().custom_user_agent));
+    dest->setExtraData(new webkit_glue::WebURLRequestExtraDataImpl(
+        WebKit::WebReferrerPolicyDefault,  // Ignored.
+        WebString::fromUTF8(data().custom_user_agent)));
   }
 
   return true;
 }
 
 bool PPB_URLRequestInfo_Impl::RequiresUniversalAccess() const {
   return
       data().has_custom_referrer_url ||
       data().has_custom_content_transfer_encoding ||
       data().has_custom_user_agent ||
@@ skipping 61 matching lines @@
       webkit_glue::FilePathToWebString(platform_path),
       start_offset,
       number_of_bytes,
       expected_last_modified_time);
   return true;
 }
 
 
 }  // namespace ppapi
 }  // namespace webkit