Merge NavigationController and NavigationControllerBase for test_shell. I also removed all the inapplicable crap that was in there like transition and tab types.

BUG=1319488

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1120 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 3 insertions, 5 deletions

diff --git a/webkit/tools/test_shell/test_shell.cc b/webkit/tools/test_shell/test_shell.cc
index 89585ae..d1e5042 100644
--- a/webkit/tools/test_shell/test_shell.cc
+++ b/webkit/tools/test_shell/test_shell.cc
@@ -862,11 +862,10 @@ void TestShell::LoadURLForFrame(const wchar_t* url,
         frame_string = frame_name;
 
     navigation_controller_->LoadEntry(new TestNavigationEntry(
-        -1, GURL(urlString), std::wstring(), PageTransition::LINK,
-        frame_string));
+        -1, GURL(urlString), std::wstring(), frame_string));
 }
 
-bool TestShell::Navigate(const NavigationEntry& entry, bool reload) {
+bool TestShell::Navigate(const TestNavigationEntry& entry, bool reload) {
     const TestNavigationEntry& test_entry =
         *static_cast<const TestNavigationEntry*>(&entry);
 
@@ -887,8 +886,7 @@ bool TestShell::Navigate(const NavigationEntry& entry, bool reload) {
       request->SetHistoryState(entry.GetContentState());
       
     request->SetExtraData(
-        new TestShellExtraRequestData(entry.GetPageID(),
-                                      entry.GetTransition()));
+        new TestShellExtraRequestData(entry.GetPageID()));
 
     // Get the right target frame for the entry.
     WebFrame* frame = webView()->GetMainFrame();