Modify ResourceFetcher to use WebURLLoader instead of ResourceHandle....

webkit/glue/webframe_impl.h

 /*
  * Copyright (C) 2006 Apple Computer, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 21 matching lines @@
 #include "webkit/glue/password_autocomplete_listener.h"
 #include "webkit/glue/webframe.h"
 #include "webkit/glue/webframeloaderclient_impl.h"
 
 MSVC_PUSH_WARNING_LEVEL(0);
 #include "ResourceHandleClient.h"
 #include "Frame.h"
 #include "PlatformString.h"
 MSVC_POP_WARNING();
 
-class AltErrorPageResourceFetcher;
 class ChromePrintContext;
 class WebDataSourceImpl;
 class WebPluginDelegate;
 class WebView;
 class WebViewImpl;
 class WebTextInput;
 class WebTextInputImpl;
 
+namespace gfx {
+class BitmapPlatformDevice;
+}
+
 namespace WebCore {
 class Frame;
 class FrameView;
 class HistoryItem;
 class KURL;
 class Node;
 class Range;
 class SubstituteData;
 struct WindowFeatures;
 }
 
-namespace gfx {
-class BitmapPlatformDevice;
+namespace webkit_glue {
+class AltErrorPageResourceFetcher;
 }
 
 // Implementation of WebFrame, note that this is a reference counted object.
 class WebFrameImpl : public WebFrame, public base::RefCounted<WebFrameImpl> {
  public:
   WebFrameImpl();
   ~WebFrameImpl();
 
   static int live_object_count() {
     return live_object_count_;
@@ skipping 17 matching lines @@
       const WebKit::WebData& data,
       const WebKit::WebURL& base_url,
       const WebKit::WebURL& unreachable_url = WebKit::WebURL(),
       bool replace = false);
   virtual void LoadAlternateHTMLErrorPage(
       const WebKit::WebURLRequest& request,
       const WebKit::WebURLError& error,
       const GURL& error_page_url,
       bool replace,
       const GURL& fake_url);
+  virtual void DispatchWillSendRequest(WebKit::WebURLRequest* request);
   virtual void ExecuteScript(const WebKit::WebScriptSource& source);
   virtual void ExecuteScriptInNewContext(
       const WebKit::WebScriptSource* sources, int num_sources);
   virtual bool InsertCSSStyles(const std::string& css);
   virtual WebKit::WebHistoryItem GetPreviousHistoryItem() const;
   virtual WebKit::WebHistoryItem GetCurrentHistoryItem() const;
   virtual GURL GetURL() const;
   virtual GURL GetFavIconURL() const;
   virtual GURL GetOSDDURL() const;
   virtual int GetContentsPreferredWidth() const;
@@ skipping 162 matching lines @@
   // WebFrameLoaderClient
   void Closing();
 
   // See WebFrame.h for details.
   virtual void IncreaseMatchCount(int count, int request_id);
   virtual void ReportFindInPageSelection(const WebKit::WebRect& selection_rect,
                                          int active_match_ordinal,
                                          int request_id);
 
   // Resource fetcher for downloading an alternate DNS error page.
-  scoped_ptr<AltErrorPageResourceFetcher> alt_error_page_fetcher_;
+  scoped_ptr<webkit_glue::AltErrorPageResourceFetcher> alt_error_page_fetcher_;
 
   // Used to check for leaks of this object.
   static int live_object_count_;
 
   WebFrameLoaderClient frame_loader_client_;
 
   // This is a factory for creating cancelable tasks for this frame that run
   // asynchronously in order to scope string matches during a find operation.
   ScopedRunnableMethodFactory<WebFrameImpl> scope_matches_factory_;
 
@@ skipping 105 matching lines @@
   // The input fields that are interested in edit events and their associated
   // listeners.
   typedef HashMap<RefPtr<WebCore::HTMLInputElement>,
       webkit_glue::PasswordAutocompleteListener*> PasswordListenerMap;
   PasswordListenerMap password_listeners_;
 
   DISALLOW_COPY_AND_ASSIGN(WebFrameImpl);
 };
 
 #endif  // WEBKIT_GLUE_WEBFRAME_IMPL_H_