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, 1 insertions, 20 deletions

diff --git a/webkit/tools/test_shell/test_webview_delegate.cc b/webkit/tools/test_shell/test_webview_delegate.cc
index 3e23252..92959f6 100644
--- a/webkit/tools/test_shell/test_webview_delegate.cc
+++ b/webkit/tools/test_shell/test_webview_delegate.cc
@@ -879,24 +879,6 @@ void TestWebViewDelegate::UpdateURL(WebFrame* frame) {
     entry->SetURL(GURL(request.GetURL()));
   }
 
-  if (shell_->webView()->GetMainFrame() == frame) {
-    // Top-level navigation.
-
-    PageTransition::Type transition = extra_data ?
-        extra_data->transition_type : PageTransition::LINK;
-    if (!PageTransition::IsMainFrame(transition)) {
-      transition = PageTransition::LINK;
-    }
-    entry->SetTransition(transition);
-  } else {
-    PageTransition::Type transition;
-    if (page_id_ > last_page_id_updated_)
-      transition = PageTransition::MANUAL_SUBFRAME;
-    else
-      transition = PageTransition::AUTO_SUBFRAME;
-    entry->SetTransition(transition);
-  }
-
   shell_->navigation_controller()->DidNavigateToEntry(entry.release());
 
   last_page_id_updated_ = std::max(last_page_id_updated_, page_id_);
@@ -910,8 +892,7 @@ void TestWebViewDelegate::UpdateSessionHistory(WebFrame* frame) {
     return;
 
   TestNavigationEntry* entry = static_cast<TestNavigationEntry*>(
-      shell_->navigation_controller()->GetEntryWithPageID(
-          TestNavigationEntry::GetTabContentsType(), page_id_));
+      shell_->navigation_controller()->GetEntryWithPageID(page_id_));
   if (!entry)
     return;