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

webkit/glue/weburlrequest_extradata_impl.cc

Index: webkit/glue/weburlrequest_extradata_impl.cc
===================================================================
--- webkit/glue/weburlrequest_extradata_impl.cc	(revision 147918)
+++ webkit/glue/weburlrequest_extradata_impl.cc	(working copy)
@@ -1,16 +1,19 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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/glue/weburlrequest_extradata_impl.h"
 
 using WebKit::WebReferrerPolicy;
+using WebKit::WebString;
 
 namespace webkit_glue {
 
 WebURLRequestExtraDataImpl::WebURLRequestExtraDataImpl(
-    WebReferrerPolicy referrer_policy)
-    : referrer_policy_(referrer_policy) {
+    WebReferrerPolicy referrer_policy,
+    const WebString& custom_user_agent)
+    : referrer_policy_(referrer_policy),
+      custom_user_agent_(custom_user_agent) {
 }
 
 WebURLRequestExtraDataImpl::~WebURLRequestExtraDataImpl() {