Move ExtraData from WebRequest to WebDataSource....

webkit/tools/test_shell/test_webview_delegate.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.
 
 // This file contains the implementation of TestWebViewDelegate, which serves
 // as the WebViewDelegate for the TestShellWebHost.  The host is expected to
 // have initialized a MessageLoop before these methods are called.
 
 #include "config.h"
 
@@ skipping 225 matching lines @@
     printf("%s - didFailLoadingWithError <WebError code %d,"
            " failing URL \"%s\">\n",
            GetResourceDescription(identifier).c_str(),
            error.GetErrorCode(),
            error.GetFailedURL().spec().c_str());
   }
 
   resource_identifier_map_.erase(identifier);
 }
 
+void TestWebViewDelegate::DidCreateDataSource(WebFrame* frame,
+                                              WebDataSource* ds) {
+  ds->SetExtraData(pending_extra_data_.release());
+}
+
 void TestWebViewDelegate::DidStartProvisionalLoadForFrame(
     WebView* webview,
     WebFrame* frame,
     NavigationGesture gesture) {
   if (shell_->ShouldDumpFrameLoadCallbacks()) {
     printf("%S - didStartProvisionalLoadForFrame\n",
            GetFrameDescription(frame).c_str());
   }
 
   if (!top_loading_frame_) {
@@ skipping 33 matching lines @@
   // Don't display an error page if we're running layout tests, because
   // DumpRenderTree doesn't.
   if (shell_->layout_test_mode())
     return;
 
   // Don't display an error page if this is simply a cancelled load.  Aside
   // from being dumb, WebCore doesn't expect it and it will cause a crash.
   if (error.GetErrorCode() == net::ERR_ABORTED)
     return;
 
-  const WebRequest& failed_request =
-      frame->GetProvisionalDataSource()->GetRequest();
-  TestShellExtraRequestData* extra_data =
-      static_cast<TestShellExtraRequestData*>(failed_request.GetExtraData());
+  const WebDataSource* failed_ds = frame->GetProvisionalDataSource();
+
+  TestShellExtraData* extra_data =
+      static_cast<TestShellExtraData*>(failed_ds->GetExtraData());
   bool replace = extra_data && extra_data->pending_page_id != -1;
 
-  scoped_ptr<WebRequest> request(failed_request.Clone());
+  scoped_ptr<WebRequest> request(failed_ds->GetRequest().Clone());
 
   std::string error_text =
       StringPrintf("Error %d when loading url %s", error.GetErrorCode(),
       request->GetURL().spec().c_str());
   request->SetURL(GURL("testshell-error:"));
 
   frame->LoadAlternateHTMLString(request.get(), error_text,
                                  error.GetFailedURL(), replace);
 }
 
@@ skipping 63 matching lines @@
 void TestWebViewDelegate::DidHandleOnloadEventsForFrame(WebView* webview,
                                                         WebFrame* frame) {
   if (shell_->ShouldDumpFrameLoadCallbacks()) {
     printf("%S - didHandleOnloadEventsForFrame\n",
            GetFrameDescription(frame).c_str());
   }
 }
 
 void TestWebViewDelegate::DidChangeLocationWithinPageForFrame(
     WebView* webview, WebFrame* frame, bool is_new_navigation) {
+  frame->GetDataSource()->SetExtraData(pending_extra_data_.release());
+
   if (shell_->ShouldDumpFrameLoadCallbacks()) {
     printf("%S - didChangeLocationWithinPageForFrame\n",
            GetFrameDescription(frame).c_str());
   }
 
   UpdateForCommittedLoad(frame, is_new_navigation);
 }
 
 void TestWebViewDelegate::DidReceiveIconForFrame(WebView* webview,
                                                  WebFrame* frame) {
@@ skipping 403 matching lines @@
 WebWidgetHost* TestWebViewDelegate::GetHostForWidget(WebWidget* webwidget) {
   if (webwidget == shell_->webView())
     return shell_->webViewHost();
   if (webwidget == shell_->popup())
     return shell_->popupHost();
   return NULL;
 }
 
 void TestWebViewDelegate::UpdateForCommittedLoad(WebFrame* frame,
                                                  bool is_new_navigation) {
-  WebView* webview = shell_->webView();
-
   // Code duplicated from RenderView::DidCommitLoadForFrame.
-  const WebRequest& request =
-      webview->GetMainFrame()->GetDataSource()->GetRequest();
-  TestShellExtraRequestData* extra_data =
-      static_cast<TestShellExtraRequestData*>(request.GetExtraData());
+  TestShellExtraData* extra_data = static_cast<TestShellExtraData*>(
+      frame->GetDataSource()->GetExtraData());
 
   if (is_new_navigation) {
     // New navigation.
     UpdateSessionHistory(frame);
     page_id_ = next_page_id_++;
   } else if (extra_data && extra_data->pending_page_id != -1 &&
              !extra_data->request_committed) {
     // This is a successful session history navigation!
     UpdateSessionHistory(frame);
     page_id_ = extra_data->pending_page_id;
@@ skipping 59 matching lines @@
       return L"main frame \"" + name + L"\"";
     else
       return L"main frame";
   } else {
     if (name.length())
       return L"frame \"" + name + L"\"";
     else
       return L"frame (anonymous)";
   }
 }