Rename NavigationController to NavigationControllerImpl and put it into the content namespace. Al...

content/browser/tab_contents/test_tab_contents.cc

 // Copyright (c) 2011 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.
 
 #include "content/browser/tab_contents/test_tab_contents.h"
 
 #include <utility>
 
 #include "content/browser/browser_url_handler.h"
 #include "content/browser/renderer_host/mock_render_process_host.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/renderer_host/test_render_view_host.h"
 #include "content/browser/site_instance.h"
-#include "content/browser/tab_contents/navigation_entry.h"
+#include "content/browser/tab_contents/navigation_entry_impl.h"
 #include "content/common/view_messages.h"
 #include "content/public/common/page_transition_types.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/forms/password_form.h"
 
+using content::NavigationEntry;
+
 TestTabContents::TestTabContents(content::BrowserContext* browser_context,
                                  SiteInstance* instance)
     : TabContents(browser_context, instance, MSG_ROUTING_NONE, NULL, NULL),
       transition_cross_site(false),
       delegate_view_override_(NULL),
       expect_set_history_length_and_prune_(false),
       expect_set_history_length_and_prune_site_instance_(NULL),
       expect_set_history_length_and_prune_history_length_(0),
       expect_set_history_length_and_prune_min_page_id_(-1) {
 }
@@ skipping 74 matching lines @@
 void TestTabContents::CommitPendingNavigation() {
   // If we are doing a cross-site navigation, this simulates the current RVH
   // notifying that it has unloaded so the pending RVH is resumed and can
   // navigate.
   ProceedWithCrossSiteNavigation();
   RenderViewHost* old_rvh = render_manager_.current_host();
   TestRenderViewHost* rvh = pending_rvh();
   if (!rvh)
     rvh = static_cast<TestRenderViewHost*>(old_rvh);
 
-  const content::NavigationEntry* entry = GetController().GetPendingEntry();
+  const NavigationEntry* entry = GetController().GetPendingEntry();
   DCHECK(entry);
   int page_id = entry->GetPageID();
   if (page_id == -1) {
     // It's a new navigation, assign a never-seen page id to it.
     page_id = GetMaxPageIDForSiteInstance(rvh->site_instance()) + 1;
   }
   rvh->SendNavigate(page_id, entry->GetURL());
 
   // Simulate the SwapOut_ACK that fires if you commit a cross-site navigation
   // without making any network requests.
@@ skipping 27 matching lines @@
 
 void TestTabContents::SetHistoryLengthAndPrune(
     const SiteInstance* site_instance, int history_length, int32 min_page_id) {
   EXPECT_TRUE(expect_set_history_length_and_prune_);
   expect_set_history_length_and_prune_ = false;
   EXPECT_EQ(expect_set_history_length_and_prune_site_instance_, site_instance);
   EXPECT_EQ(expect_set_history_length_and_prune_history_length_,
             history_length);
   EXPECT_EQ(expect_set_history_length_and_prune_min_page_id_, min_page_id);
 }