Move ExtraData from WebRequest to WebDataSource....

webkit/tools/test_shell/test_webview_delegate.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.
 
 // TestWebViewDelegate class:
 // This class implements the WebViewDelegate methods for the test shell.  One
 // instance is owned by each TestShell.
 
 #ifndef WEBKIT_TOOLS_TEST_SHELL_TEST_WEBVIEW_DELEGATE_H_
 #define WEBKIT_TOOLS_TEST_SHELL_TEST_WEBVIEW_DELEGATE_H_
 
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #endif
 #include <map>
 
 #if defined(OS_LINUX)
 #include <gdk/gdkcursor.h>
 #endif
 
 #include "base/basictypes.h"
 #include "base/ref_counted.h"
+#include "base/scoped_ptr.h"
 #include "webkit/glue/webcursor.h"
 #include "webkit/glue/webview_delegate.h"
 #include "webkit/glue/webwidget_delegate.h"
 #if defined(OS_WIN)
 #include "webkit/tools/test_shell/drag_delegate.h"
 #include "webkit/tools/test_shell/drop_delegate.h"
 #endif
+#include "webkit/tools/test_shell/test_navigation_controller.h"
 
 struct WebPreferences;
 class GURL;
 class TestShell;
 class WebDataSource;
 class WebWidgetHost;
 
 class TestWebViewDelegate : public base::RefCounted<TestWebViewDelegate>,
                             public WebViewDelegate {
  public:
@@ skipping 74 matching lines @@
                                int y,
                                const GURL& link_url,
                                const GURL& image_url,
                                const GURL& page_url,
                                const GURL& frame_url,
                                const std::wstring& selection_text,
                                const std::wstring& misspelled_word,
                                int edit_flags,
                                const std::string& security_info,
                                const std::string& frame_charset);
+  virtual void DidCreateDataSource(WebFrame* frame,
+                                   WebDataSource* ds);
   virtual void DidStartProvisionalLoadForFrame(
     WebView* webview,
     WebFrame* frame,
     NavigationGesture gesture);
   virtual void DidReceiveServerRedirectForProvisionalLoadForFrame(
     WebView* webview, WebFrame* frame);
   virtual void DidFailProvisionalLoadWithError(WebView* webview,
                                                const WebError& error,
                                                WebFrame* frame);
   virtual void DidCommitLoadForFrame(WebView* webview, WebFrame* frame,
@@ skipping 118 matching lines @@
   IDropTarget* drop_delegate() { return drop_delegate_.get(); }
   IDropSource* drag_delegate() { return drag_delegate_.get(); }
 #endif
   const CapturedContextMenuEvents& captured_context_menu_events() const {
     return captured_context_menu_events_;
   }
   void clear_captured_context_menu_events() {
     captured_context_menu_events_.clear();
   }
 
+  void set_pending_extra_data(TestShellExtraData* extra_data) {
+    pending_extra_data_.reset(extra_data);
+  }
+
   // Methods for modifying WebPreferences
   void SetUserStyleSheetEnabled(bool is_enabled);
   void SetUserStyleSheetLocation(const GURL& location);
 
   // Sets the webview as a drop target.
   void RegisterDragDrop();
 
   void SetCustomPolicyDelegate(bool is_custom, bool is_permissive);
   void WaitForPolicyDelegate();
 
@@ skipping 46 matching lines @@
   // Non-owning pointer.  The delegate is owned by the host.
   TestShell* shell_;
 
   // This is non-NULL IFF a load is in progress.
   WebFrame* top_loading_frame_;
 
   // For tracking session history.  See RenderView.
   int page_id_;
   int last_page_id_updated_;
 
+  scoped_ptr<TestShellExtraData> pending_extra_data_;
+
   // Maps resource identifiers to a descriptive string.
   typedef std::map<uint32, std::string> ResourceMap;
   ResourceMap resource_identifier_map_;
   std::string GetResourceDescription(uint32 identifier);
 
   // true if we want to enable smart insert/delete.
   bool smart_insert_delete_enabled_;
 
   // true if we want to enable selection of trailing whitespaces
   bool select_trailing_whitespace_enabled_;
@@ skipping 11 matching lines @@
   // cursor.
   GdkCursorType cursor_type_;
 #endif
 
   CapturedContextMenuEvents captured_context_menu_events_;
 
   DISALLOW_COPY_AND_ASSIGN(TestWebViewDelegate);
 };
 
 #endif  // WEBKIT_TOOLS_TEST_SHELL_TEST_WEBVIEW_DELEGATE_H_