Get rid of stashing a frame pointer with ResourceRequest and just store the r...

webkit/glue/resource_fetcher.cc

 // 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.
 
 #include "config.h"
 #include "webkit/glue/resource_fetcher.h"
 
 #include "base/compiler_specific.h"
 
 MSVC_PUSH_WARNING_LEVEL(0);
 #include "FrameLoader.h"
+#include "FrameLoaderClient.h"
 #include "ResourceHandle.h"
 #include "ResourceRequest.h"
 MSVC_POP_WARNING();
 
 #undef LOG
 #include "base/logging.h"
 #include "webkit/glue/glue_util.h"
 #include "net/url_request/url_request_status.h"
 
 using WebCore::ResourceError;
@@ skipping 27 matching lines @@
   if (!frame_loader) {
     // We put this on a 0 timer so the callback happens async (consistent with
     // regular fetches).
     start_failed_timer_.reset(new StartFailedTimer(this,
           &ResourceFetcher::StartFailed));
     start_failed_timer_->startOneShot(0);
     return;
   }
 
   WebCore::ResourceRequest request(webkit_glue::GURLToKURL(url_));
-  request.setFrame(frame);
+  WebCore::ResourceResponse response;
+  frame_loader->client()->dispatchWillSendRequest(NULL, 0, request, response);
 
   loader_ = ResourceHandle::create(request, this, NULL, false, false);
 }
 
 void ResourceFetcher::StartFailed(StartFailedTimer* timer) {
   didFail(NULL, ResourceError());
 }
 
 /////////////////////////////////////////////////////////////////////////////
 // ResourceHandleClient methods
@@ skipping 44 matching lines @@
       &ResourceFetcherWithTimeout::TimeoutFired));
   timeout_timer_->startOneShot(timeout_secs);
 }
 
 void ResourceFetcherWithTimeout::TimeoutFired(FetchTimer* timer) {
   if (!completed_) {
     loader_->cancel();
     didFail(NULL, ResourceError());
   }
 }