Delete files from webkit/glue that have been made obsolete by corresponding

files in webkit/api.

Here's the mapping:
  webkit/glue/webdatasource.h  ->  webkit/api/public/WebDataSource.h
  webkit/glue/weberror.h       ->  webkit/api/public/WebURLError.h
  webkit/glue/weburlrequest.h  ->  webkit/api/public/WebURLRequest.h
  webkit/glue/webresponse.h    ->  webkit/api/public/WebURLResponse.h

I kept the implementation of WebDataSource in webkit/glue for now because it
helps to have it close to WebFrameImpl and WebFrameLoaderClient.

To facilitate this change, I needed to make use of WrappedResourceRequest and
WrappedResourceResponse from webkit/api/src within the implementation files of
webkit/glue.  This is only a temporary usage of webkit/api/src from the
outside.  It will go away when WebFrame, etc. get moved into webkit/api.

I modified these wrapper classes to expose the 'bind' function so that I can
re-bind a wrapper.  This is used in WebDataSourceImpl::request() and related
methods to allow the interface to return a const reference to a WebURLRequest
and WebURLResponse.

The changes here are fairly mechanical.  I'm not too happy about the way
WebDataSource::redirectChain now works.  I would prefer a solution that didn't
involve so much copying, but I'm not going to worry about optimizing that now.

R=brettw
BUG=10041
TEST=none

Review URL: http://codereview.chromium.org/126286

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

1 files changed, 7 insertions, 10 deletions

diff --git a/webkit/glue/webframe_impl.h b/webkit/glue/webframe_impl.h
index 54da684..6db3aa0 100644
--- a/webkit/glue/webframe_impl.h
+++ b/webkit/glue/webframe_impl.h
@@ -42,9 +42,7 @@ MSVC_POP_WARNING();
 class AltErrorPageResourceFetcher;
 class ChromePrintContext;
 class WebDataSourceImpl;
-class WebErrorImpl;
 class WebPluginDelegate;
-class WebRequest;
 class WebView;
 class WebViewImpl;
 class WebTextInput;
@@ -78,16 +76,16 @@ class WebFrameImpl : public WebFrame, public base::RefCounted<WebFrameImpl> {
   void InitMainFrame(WebViewImpl* webview_impl);
 
   // WebFrame
-  virtual void LoadRequest(WebRequest* request);
+  virtual void LoadRequest(const WebKit::WebURLRequest& request);
   virtual void LoadHistoryState(const std::string& history_state);
   virtual void LoadHTMLString(const std::string& html_text,
                               const GURL& base_url);
-  virtual void LoadAlternateHTMLString(const WebRequest* request,
+  virtual void LoadAlternateHTMLString(const WebKit::WebURLRequest& request,
                                        const std::string& html_text,
                                        const GURL& display_url,
                                        bool replace);
-  virtual void LoadAlternateHTMLErrorPage(const WebRequest* request,
-                                          const WebError& error,
+  virtual void LoadAlternateHTMLErrorPage(const WebKit::WebURLRequest& request,
+                                          const WebKit::WebURLError& error,
                                           const GURL& error_page_url,
                                           bool replace,
                                           const GURL& fake_url);
@@ -102,8 +100,8 @@ class WebFrameImpl : public WebFrame, public base::RefCounted<WebFrameImpl> {
   virtual GURL GetFavIconURL() const;
   virtual GURL GetOSDDURL() const;
   virtual int GetContentsPreferredWidth() const;
-  virtual WebDataSource* GetDataSource() const;
-  virtual WebDataSource* GetProvisionalDataSource() const;
+  virtual WebKit::WebDataSource* GetDataSource() const;
+  virtual WebKit::WebDataSource* GetProvisionalDataSource() const;
   virtual void StopLoading();
   virtual WebFrame* GetOpener() const;
   virtual WebFrame* GetParent() const;
@@ -393,9 +391,8 @@ class WebFrameImpl : public WebFrame, public base::RefCounted<WebFrameImpl> {
   // Determines whether to invalidate the content area and scrollbar.
   void InvalidateIfNecessary();
 
-  void InternalLoadRequest(const WebRequest* request,
+  void InternalLoadRequest(const WebKit::WebURLRequest& request,
                            const WebCore::SubstituteData& data,
-                           PassRefPtr<WebCore::HistoryItem> history_item,
                            bool replace);
 
   // Clears the map of password listeners.