Move ExtraData from WebRequest to WebDataSource....

webkit/glue/weburlrequest.h

 // Copyright (c) 2006-2008 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_WEBURLREQUEST_H_
 #define WEBKIT_GLUE_WEBURLREQUEST_H_
 
 #include <map>
 #include <string>
 
 #include "base/ref_counted.h"
 
 enum WebRequestCachePolicy {
   WebRequestUseProtocolCachePolicy,
   WebRequestReloadIgnoringCacheData,
   WebRequestReturnCacheDataElseLoad,
   WebRequestReturnCacheDataDontLoad
 };
 
 namespace net {
 class UploadData;
 }
 
 class GURL;
 
 class WebRequest {
  public:
   typedef std::map<std::string, std::string> HeaderMap;
 
-  // Extra information that is associated with a request. The embedder derives
-  // from this REFERENCE COUNTED class to associated data with a request and
-  // get it back when the page loads.
-  //
-  // Note that for reloads (and possibly things like back/forward), there is no
-  // way to specify the request that it will use, so the extra data pointer
-  // will be invalid. Users should always check for NULL.
-  class ExtraData : public base::RefCounted<ExtraData> {
-   public:
-    virtual ~ExtraData() {}
-  };
-
   // Creates a WebRequest.
   static WebRequest* Create(const GURL& url);
 
   // Creates a copy of this WebRequest.
   virtual WebRequest* Clone() const = 0;
 
-  // Sets the extra request info that the embedder can retrieve later. This
-  // will AddRef the ExtraData and store it with the request.
-  virtual void SetExtraData(ExtraData* extra) = 0;
-
-  // Returns any previously set request info. It does not AddRef, the caller
-  // is assumed to assign this to a RefPtr. This may return NULL if no extra
-  // data has been set on this request. Even if the embedder sets request info
-  // for every request, WebRequests can get created during reload operations
-  // so callers should not assume the data is always valid.
-  virtual ExtraData* GetExtraData() const = 0;
-
   // Get/set the URL.
   virtual GURL GetURL() const = 0;
   virtual void SetURL(const GURL& url) = 0;
 
   // Get/set the main document URL, which may be different from the URL for a
   // subframe load.
   virtual GURL GetMainDocumentURL() const = 0;
   virtual void SetMainDocumentURL(const GURL& url) = 0;
 
   // Get/set the cache policy.
@@ skipping 54 matching lines @@
   // Set the request upload data.
   virtual void SetUploadData(const net::UploadData& data) = 0;
 
   // Sets the requestor id.
   virtual void SetRequestorID(int requestor_id) = 0;
 
   virtual ~WebRequest() { }
 };
 
 #endif  // #ifndef WEBKIT_GLUE_WEBURLREQUEST_H_