Convert WebContents to return a content::NavigationController instead of the implementation. Upda...

chrome/browser/browser_commands_unittest.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 "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/browser_with_test_window_test.h"
 #include "chrome/test/base/testing_profile.h"
-#include "content/browser/tab_contents/navigation_controller.h"
 #include "content/browser/tab_contents/tab_contents.h"
+#include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/test/test_browser_thread.h"
 
 typedef BrowserWithTestWindowTest BrowserCommandsTest;
 
 using content::OpenURLParams;
 using content::Referrer;
 
 // Tests IDC_SELECT_TAB_0, IDC_SELECT_NEXT_TAB, IDC_SELECT_PREVIOUS_TAB and
 // IDC_SELECT_LAST_TAB.
@@ skipping 42 matching lines @@
   browser()->ExecuteCommand(IDC_DUPLICATE_TAB);
 
   // The duplicated tab should not end up in a new window.
   size_t window_count = BrowserList::size();
   ASSERT_EQ(initial_window_count, window_count);
 
   // And we should have a newly duplicated tab.
   ASSERT_EQ(2, browser()->tab_count());
 
   // Verify the stack of urls.
-  NavigationController& controller =
+  content::NavigationController& controller =
       browser()->GetTabContentsAt(1)->GetController();
   ASSERT_EQ(3, controller.GetEntryCount());
   ASSERT_EQ(2, controller.GetCurrentEntryIndex());
   ASSERT_TRUE(url1 == controller.GetEntryAtIndex(0)->GetURL());
   ASSERT_TRUE(url2 == controller.GetEntryAtIndex(1)->GetURL());
   ASSERT_TRUE(url3 == controller.GetEntryAtIndex(2)->GetURL());
 }
 
 TEST_F(BrowserCommandsTest, BookmarkCurrentPage) {
   // We use profile() here, since it's a TestingProfile.
@@ skipping 104 matching lines @@
 
   // Pressing it a second time while the NTP is open shouldn't change anything.
   browser()->Search();
   ASSERT_EQ(2, browser()->tab_count());
   ASSERT_EQ(1, browser()->active_index());
   current_url = browser()->GetSelectedWebContents()->GetURL();
   EXPECT_TRUE(current_url.SchemeIs(chrome::kChromeUIScheme));
   EXPECT_EQ(chrome::kChromeUINewTabHost, current_url.host());
 }
 #endif