Move ExtraData from WebRequest to WebDataSource....

webkit/tools/test_shell/test_navigation_controller.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.
 
 #ifndef WEBKIT_TOOLS_TEST_SHELL_TEST_NAVIGATION_CONTROLLER_H_
 #define WEBKIT_TOOLS_TEST_SHELL_TEST_NAVIGATION_CONTROLLER_H_
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/linked_ptr.h"
 #include "base/ref_counted.h"
 #include "googleurl/src/gurl.h"
-#include "webkit/glue/weburlrequest.h"
+#include "webkit/glue/webdatasource.h"
 
 class GURL;
 class TestShell;
 
 // Associated with browser-initated navigations to hold tracking data.
-class TestShellExtraRequestData : public WebRequest::ExtraData {
+class TestShellExtraData : public WebDataSource::ExtraData {
  public:
-  TestShellExtraRequestData(int32 pending_page_id)
-      : WebRequest::ExtraData(),
-        pending_page_id(pending_page_id),
+  TestShellExtraData(int32 pending_page_id)
+      : pending_page_id(pending_page_id),
         request_committed(false) {
   }
 
   // Contains the page_id for this navigation or -1 if there is none yet.
   int32 pending_page_id;
 
   // True if we have already processed the "DidCommitLoad" event for this
   // request.  Used by session history.
   bool request_committed;
 };
@@ skipping 145 matching lines @@
   // new entry (created by LoadURL).
   int pending_entry_index_;
 
   TestShell* shell_;
   int max_page_id_;
 
   DISALLOW_EVIL_CONSTRUCTORS(TestNavigationController);
 };
 
 #endif // WEBKIT_TOOLS_TEST_SHELL_TEST_NAVIGATION_CONTROLLER_H_