Move the RequestExtraData structure to content/, where we can modify it more freely.

BUG=87192
TEST=none
Review URL: http://codereview.chromium.org/7697009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97539 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 8 insertions, 59 deletions

diff --git a/webkit/glue/request_extra_data.cc b/webkit/glue/request_extra_data.cc
deleted file mode 100644
index 8870fed..0000000
--- a/webkit/glue/request_extra_data.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright (c) 2011 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/request_extra_data.h"
-
-RequestExtraData::~RequestExtraData() {}
-
-RequestExtraData::RequestExtraData(bool is_main_frame,
-                                   int64 frame_identifier)
-    : is_main_frame_(is_main_frame),
-      frame_identifier_(frame_identifier) {
-}
diff --git a/webkit/glue/request_extra_data.h b/webkit/glue/request_extra_data.h
deleted file mode 100644
index 1dd6103..0000000
--- a/webkit/glue/request_extra_data.h
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (c) 2011 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.
-
-#ifndef WEBKIT_GLUE_REQUEST_EXTRA_DATA_H_
-#define WEBKIT_GLUE_REQUEST_EXTRA_DATA_H_
-#pragma once
-
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebURLRequest.h"
-
-// The RenderView stores an instance of this class in the "extra data" of each
-// ResourceRequest (see RenderView::willSendRequest).
-class RequestExtraData : public WebKit::WebURLRequest::ExtraData {
- public:
-  RequestExtraData(bool is_main_frame, int64 frame_identifier);
-  virtual ~RequestExtraData();
-
-  bool is_main_frame() const { return is_main_frame_; }
-
-  int64 frame_identifier() const { return frame_identifier_; }
-
- private:
-  bool is_main_frame_;
-  int64 frame_identifier_;
-
-  DISALLOW_COPY_AND_ASSIGN(RequestExtraData);
-};
-
-#endif  // WEBKIT_GLUE_REQUEST_EXTRA_DATA_H_
diff --git a/webkit/glue/resource_loader_bridge.cc b/webkit/glue/resource_loader_bridge.cc
index 4cc012d..9b85c82 100644
--- a/webkit/glue/resource_loader_bridge.cc
+++ b/webkit/glue/resource_loader_bridge.cc
@@ -56,7 +56,8 @@ ResourceLoaderBridge::RequestInfo::RequestInfo()
       appcache_host_id(0),
       routing_id(0),
       download_to_file(false),
-      has_user_gesture(false) {
+      has_user_gesture(false),
+      extra_data(NULL) {
 }
 
 ResourceLoaderBridge::RequestInfo::~RequestInfo() {
diff --git a/webkit/glue/resource_loader_bridge.h b/webkit/glue/resource_loader_bridge.h
index a978166..6711039 100644
--- a/webkit/glue/resource_loader_bridge.h
+++ b/webkit/glue/resource_loader_bridge.h
@@ -33,6 +33,7 @@
 #include "googleurl/src/gurl.h"
 #include "net/base/host_port_pair.h"
 #include "net/url_request/url_request_status.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebURLRequest.h"
 #include "webkit/glue/resource_type.h"
 
 namespace net {
@@ -247,12 +248,11 @@ class ResourceLoaderBridge {
     // True if the request was user initiated.
     bool has_user_gesture;
 
-    // True if |frame_id| represents a main frame of a RenderView.
-    bool is_main_frame;
+    // Extra data associated with this request.  We do not own this pointer.
+    WebKit::WebURLRequest::ExtraData* extra_data;
 
-    // Identifies the frame within the RenderView that sent the request.
-    // -1 if unknown / invalid.
-    int64 frame_id;
+   private:
+    DISALLOW_COPY_AND_ASSIGN(RequestInfo);
   };
 
   // See the SyncLoad method declared below.  (The name of this struct is not
diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi
index 0d93dd4..b1d76cb 100644
--- a/webkit/glue/webkit_glue.gypi
+++ b/webkit/glue/webkit_glue.gypi
@@ -387,8 +387,6 @@
         'resource_loader_bridge.h',
         'resource_type.cc',
         'resource_type.h',
-        'request_extra_data.cc',
-        'request_extra_data.h',
         'scoped_clipboard_writer_glue.h',
         'simple_webmimeregistry_impl.cc',
         'simple_webmimeregistry_impl.h',
diff --git a/webkit/glue/weburlloader_impl.cc b/webkit/glue/weburlloader_impl.cc
index 97ada31..6678954 100644
--- a/webkit/glue/weburlloader_impl.cc
+++ b/webkit/glue/weburlloader_impl.cc
@@ -30,7 +30,6 @@
 #include "webkit/glue/ftp_directory_listing_response_delegate.h"
 #include "webkit/glue/multipart_response_delegate.h"
 #include "webkit/glue/resource_loader_bridge.h"
-#include "webkit/glue/request_extra_data.h"
 #include "webkit/glue/webkit_glue.h"
 
 using base::Time;
@@ -412,14 +411,7 @@ void WebURLLoaderImpl::Context::Start(
   request_info.routing_id = request.requestorID();
   request_info.download_to_file = request.downloadToFile();
   request_info.has_user_gesture = request.hasUserGesture();
-  request_info.frame_id = -1;
-  request_info.is_main_frame = false;
-  if (request.extraData()) {
-    RequestExtraData* extra_data =
-        static_cast<RequestExtraData*>(request.extraData());
-    request_info.frame_id = extra_data->frame_identifier();
-    request_info.is_main_frame = extra_data->is_main_frame();
-  }
+  request_info.extra_data = request.extraData();
   bridge_.reset(ResourceLoaderBridge::Create(request_info));
 
   if (!request.httpBody().isNull()) {