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

content/renderer/pepper/url_request_info_util.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 "content/renderer/pepper/url_request_info_util.h"
 
 #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"
 #include "content/renderer/pepper/pepper_file_ref_renderer_host.h"
 #include "content/renderer/pepper/pepper_plugin_instance_impl.h"
 #include "content/renderer/pepper/plugin_module.h"
 #include "content/renderer/pepper/renderer_ppapi_host_impl.h"
 #include "content/renderer/render_thread_impl.h"
 #include "net/http/http_util.h"
 #include "ppapi/proxy/ppapi_messages.h"
 #include "ppapi/shared_impl/url_request_info_data.h"
 #include "ppapi/shared_impl/var.h"
 #include "ppapi/thunk/enter.h"
 #include "third_party/WebKit/public/platform/WebData.h"
 #include "third_party/WebKit/public/platform/WebHTTPBody.h"
 #include "third_party/WebKit/public/platform/WebURL.h"
 #include "third_party/WebKit/public/platform/WebURLRequest.h"
 #include "third_party/WebKit/public/web/WebDocument.h"
 #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;
 using ppapi::thunk::EnterResourceNoLock;
 using blink::WebData;
 using blink::WebHTTPBody;
 using blink::WebString;
 using blink::WebFrame;
 using blink::WebURL;
 using blink::WebURLRequest;
@@ skipping 128 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) {
     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();
+    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;
 }
 
 bool URLRequestRequiresUniversalAccess(const URLRequestInfoData& data) {
   return
       data.has_custom_referrer_url ||
       data.has_custom_content_transfer_encoding ||
       data.has_custom_user_agent ||
       url_util::FindAndCompareScheme(data.url, "javascript", NULL);
 }
 
 }  // namespace content