Merge weburlrequest_extradata_impl.cc/h into content/child/request_extra_data.cc/h (attempt #2)

content/renderer/pepper/url_request_info_util.cc

Index: content/renderer/pepper/url_request_info_util.cc
diff --git a/content/renderer/pepper/url_request_info_util.cc b/content/renderer/pepper/url_request_info_util.cc
index 3059a613fac39139592ef4841b04aac07d453758..025072acb93f6e12554d72c48f9851a21f710878 100644
--- a/content/renderer/pepper/url_request_info_util.cc
+++ b/content/renderer/pepper/url_request_info_util.cc
@@ -6,6 +6,7 @@
 
 #include "base/logging.h"
 #include "base/strings/string_util.h"
+#include "content/child/request_extra_data.h"
 #include "content/common/fileapi/file_system_messages.h"
 #include "content/renderer/pepper/common.h"
 #include "content/renderer/pepper/host_globals.h"
@@ -27,7 +28,6 @@
 #include "third_party/WebKit/public/web/WebFrame.h"
 #include "url/gurl.h"
 #include "url/url_util.h"
-#include "webkit/child/weburlrequest_extradata_impl.h"
 
 using ppapi::Resource;
 using ppapi::URLRequestInfoData;
@@ -176,9 +176,11 @@ bool CreateWebURLRequest(PP_Instance instance,
 
   if (data->has_custom_user_agent) {
     bool was_after_preconnect_request = false;
-    dest->setExtraData(new webkit_glue::WebURLRequestExtraDataImpl(
-        WebString::fromUTF8(data->custom_user_agent),
-        was_after_preconnect_request));
+    RequestExtraData* extraData = new RequestExtraData();

[jam, 2014/03/25 17:30:07]

nit: extra_data per style guide

+    extraData->set_custom_user_agent(
+        WebString::fromUTF8(data->custom_user_agent));
+    extraData->set_was_after_preconnect_request(was_after_preconnect_request);
+    dest->setExtraData(extraData);
   }
 
   return true;