TabContentsWrapper -> TabContents, part 2.

chrome/browser/ui/tab_contents/tab_contents_iterator_unittest.cc

 // Copyright (c) 2012 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/browser/ui/tab_contents/tab_contents_iterator.h"
 
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_shutdown.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/printing/background_printing_manager.h"
 #include "chrome/browser/profiles/profile_manager.h"
-#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
+#include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/browser_with_test_window_test.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_pref_service.h"
 #include "chrome/test/base/testing_profile_manager.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/test_renderer_host.h"
 
 typedef BrowserWithTestWindowTest BrowserListTest;
 
 namespace {
 
 // Helper function to iterate and count all the tabs.
 size_t CountAllTabs() {
   size_t count = 0;
   for (TabContentsIterator iterator; !iterator.done(); ++iterator)
     ++count;
   return count;
 }
 
 // Helper function to navigate to the print preview page.
-void NavigateToPrintUrl(TabContentsWrapper* tab, int page_id) {
+void NavigateToPrintUrl(TabContents* tab, int page_id) {
   content::RenderViewHostTester::For(
       tab->web_contents()->GetRenderViewHost())->SendNavigate(
           page_id, GURL(chrome::kChromeUIPrintURL));
 }
 
 }  // namespace
 
 TEST_F(BrowserListTest, TabContentsIteratorVerifyCount) {
   // Make sure we have 1 window to start with.
   EXPECT_EQ(1U, BrowserList::size());
@@ skipping 137 matching lines @@
 
   EXPECT_EQ(4U, CountAllTabs());
 
   TestingBrowserProcess* browser_process =
       static_cast<TestingBrowserProcess*>(g_browser_process);
   printing::BackgroundPrintingManager* bg_print_manager =
       browser_process->background_printing_manager();
 
   // Grab a tab and give ownership to BackgroundPrintingManager.
   TabContentsIterator tab_iterator;
-  TabContentsWrapper* tab = *tab_iterator;
+  TabContents* tab = *tab_iterator;
   int page_id = 1;
   NavigateToPrintUrl(tab, page_id++);
 
   bg_print_manager->OwnPrintPreviewTab(tab);
 
   EXPECT_EQ(4U, CountAllTabs());
 
   // Close remaining tabs.
   browser2->CloseAllTabs();
   browser3->CloseAllTabs();
 
   EXPECT_EQ(1U, CountAllTabs());
 
   // Delete the last remaining tab.
   delete tab;
 
   EXPECT_EQ(0U, CountAllTabs());
 
   // Add some tabs.
   for (size_t i = 0; i < 3; ++i) {
     browser2->NewTab();
     browser3->NewTab();
   }
 
   EXPECT_EQ(6U, CountAllTabs());
 
   // Tell BackgroundPrintingManager to take ownership of all tabs.
   // Save the tabs in |owned_tabs| because manipulating tabs in the middle of
   // TabContentsIterator is a bad idea.
-  std::vector<TabContentsWrapper*> owned_tabs;
+  std::vector<TabContents*> owned_tabs;
   for (TabContentsIterator iterator; !iterator.done(); ++iterator) {
     NavigateToPrintUrl(*iterator, page_id++);
     owned_tabs.push_back(*iterator);
   }
-  for (std::vector<TabContentsWrapper*>::iterator it = owned_tabs.begin();
+  for (std::vector<TabContents*>::iterator it = owned_tabs.begin();
        it != owned_tabs.end(); ++it) {
     bg_print_manager->OwnPrintPreviewTab(*it);
   }
 
   EXPECT_EQ(6U, CountAllTabs());
 
   // Delete all tabs to clean up.
-  for (std::vector<TabContentsWrapper*>::iterator it = owned_tabs.begin();
+  for (std::vector<TabContents*>::iterator it = owned_tabs.begin();
        it != owned_tabs.end(); ++it) {
     delete *it;
   }
 
   EXPECT_EQ(0U, CountAllTabs());
 }
 #endif
 
 #if defined(OS_CHROMEOS)
 // Calling AttemptRestart on ChromeOS will exit the test.
@@ skipping 17 matching lines @@
   testing_browser_process->SetProfileManager(profile_manager);
 
   browser::AttemptRestart();
   // Cancel the effects of us calling browser::AttemptRestart. Otherwise tests
   // ran after this one will fail.
   browser_shutdown::SetTryingToQuit(false);
 
   EXPECT_TRUE(testing_pref_service.GetBoolean(prefs::kWasRestarted));
   testing_browser_process->SetLocalState(NULL);
 }