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

webkit/glue/weburlrequest_extradata_impl.h

Index: webkit/glue/weburlrequest_extradata_impl.h
===================================================================
--- webkit/glue/weburlrequest_extradata_impl.h	(revision 147918)
+++ webkit/glue/weburlrequest_extradata_impl.h	(working copy)
@@ -8,6 +8,7 @@
 
 #include "base/compiler_specific.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebReferrerPolicy.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLRequest.h"
 #include "webkit/glue/webkit_glue_export.h"
 
@@ -18,14 +19,24 @@
 class WEBKIT_GLUE_EXPORT WebURLRequestExtraDataImpl :
     NON_EXPORTED_BASE(public WebKit::WebURLRequest::ExtraData) {
  public:
+  // |custom_user_agent| is used to communicate an overriding custom user agent
+  // to |RenderViewImpl::willSendRequest()|; set to a null string to indicate no
+  // override and an empty string to indicate that there should be no user
+  // agent. This needs to be here, instead of content's |RequestExtraData| since
+  // ppb_url_request_info_impl.cc needs to be able to set it.
   explicit WebURLRequestExtraDataImpl(
-      WebKit::WebReferrerPolicy referrer_policy);
+      WebKit::WebReferrerPolicy referrer_policy,
+      const WebKit::WebString& custom_user_agent);
   virtual ~WebURLRequestExtraDataImpl();
 
   WebKit::WebReferrerPolicy referrer_policy() const { return referrer_policy_; }
+  const WebKit::WebString& custom_user_agent() const {
+    return custom_user_agent_;
+  }
 
  private:
   WebKit::WebReferrerPolicy referrer_policy_;
+  WebKit::WebString custom_user_agent_;
 
   DISALLOW_COPY_AND_ASSIGN(WebURLRequestExtraDataImpl);
 };