Move ExtraData from WebRequest to WebDataSource....

webkit/glue/webdatasource_impl.h

 // Copyright (c) 2006-2009 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_WEBDATASOURCE_IMPL_H_
 #define WEBKIT_GLUE_WEBDATASOURCE_IMPL_H_
 
 #include "DocumentLoader.h"
 
 #include "base/scoped_ptr.h"
@@ skipping 26 matching lines @@
   virtual const PasswordForm* GetPasswordFormData() const;
   virtual bool IsFormSubmit() const;
   virtual string16 GetPageTitle() const;
   virtual base::Time GetRequestTime() const;
   virtual void SetRequestTime(base::Time time);
   virtual base::Time GetStartLoadTime() const;
   virtual base::Time GetFinishDocumentLoadTime() const;
   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);
 
   // Sets the SearchableFormData for this DocumentLoader.
   // WebDocumentLoaderImpl will own the SearchableFormData.
   void set_searchable_form_data(SearchableFormData* searchable_form_data) {
     searchable_form_data_.reset(searchable_form_data);
   }
   // Returns the SearchableFormData for this DocumentLoader.
   // WebDocumentLoaderImpl owns the returned SearchableFormData.
@@ skipping 52 matching lines @@
 
   // Lists all intermediate URLs that have redirected for the current
   // provisional load. See WebFrameLoaderClient::
   // dispatchDidReceiveServerRedirectForProvisionalLoad for a description of
   // who modifies this when to keep it up to date.
   std::vector<GURL> redirect_chain_;
 
   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.
   base::Time request_time_;
   base::Time start_load_time_;
   base::Time finish_document_load_time_;
   base::Time finish_load_time_;
   base::Time first_layout_time_;
 
   DISALLOW_COPY_AND_ASSIGN(WebDataSourceImpl);
 };
 
 #endif  // WEBKIT_GLUE_WEBDATASOURCE_IMPL_H_