Move ExtraData from WebRequest to WebDataSource....

webkit/glue/webdatasource_impl.h

Index: webkit/glue/webdatasource_impl.h
===================================================================
--- webkit/glue/webdatasource_impl.h	(revision 16382)
+++ webkit/glue/webdatasource_impl.h	(working copy)
@@ -44,17 +44,12 @@
   virtual base::Time GetFinishLoadTime() const;
   virtual base::Time GetFirstLayoutTime() const;
   virtual WebNavigationType GetNavigationType() const;
+  virtual ExtraData* GetExtraData() const;
+  virtual void SetExtraData(ExtraData*);
 
   static WebNavigationType NavigationTypeToWebNavigationType(
       WebCore::NavigationType type);
 
-  // Called after creating a new data source if there is request info
-  // available. Since we store copies of the WebRequests, the original
-  // WebRequest that the embedder created was lost, and the exra data would
-  // go with it. This preserves the request info so retrieving the requests
-  // later will have the same data.
-  void SetExtraData(WebRequest::ExtraData* extra);
-
   void ClearRedirectChain();
   void AppendRedirect(const GURL& url);
 
@@ -127,6 +122,8 @@
   scoped_ptr<const SearchableFormData> searchable_form_data_;
   scoped_ptr<const PasswordForm> password_form_data_;
 
+  OwnPtr<ExtraData> extra_data_;
+
   bool form_submit_;
 
   // See webdatasource.h for a description of these time stamps.