Move tab functions off Browser into browser_tabstrip and browser_tabrestore.

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/browser_commands.h"
+#include "chrome/browser/ui/browser_tabstrip.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"
 
@@ skipping 47 matching lines @@
   EXPECT_EQ(0U, CountAllTabs());
 
   // Add some tabs.
   for (size_t i = 0; i < 3; ++i)
     chrome::NewTab(browser2.get());
   chrome::NewTab(browser3.get());
 
   EXPECT_EQ(4U, CountAllTabs());
 
   // Close some tabs.
-  browser2->CloseAllTabs();
+  chrome::CloseAllTabs(browser2.get());
 
   EXPECT_EQ(1U, CountAllTabs());
 
   // Add lots of tabs.
   for (size_t i = 0; i < 41; ++i)
     chrome::NewTab(browser());
 
   EXPECT_EQ(42U, CountAllTabs());
   // Close all remaining tabs to keep all the destructors happy.
-  browser3->CloseAllTabs();
+  chrome::CloseAllTabs(browser3.get());
 }
 
 TEST_F(BrowserListTest, TabContentsIteratorVerifyBrowser) {
   // Make sure we have 1 window to start with.
   EXPECT_EQ(1U, BrowserList::size());
 
   // Create more browsers/windows.
   scoped_ptr<Browser> browser2(new Browser(Browser::TYPE_TABBED, profile()));
   scoped_ptr<Browser> browser3(new Browser(Browser::TYPE_TABBED, profile()));
 
@@ skipping 20 matching lines @@
   for (TabContentsIterator iterator; !iterator.done(); ++iterator, ++count) {
     if (count < 3)
       EXPECT_EQ(browser2.get(), iterator.browser());
     else if (count == 3)
       EXPECT_EQ(browser3.get(), iterator.browser());
     else
       EXPECT_TRUE(false);
   }
 
   // Close some tabs.
-  browser2->CloseAllTabs();
+  chrome::CloseAllTabs(browser2.get());
 
   count = 0;
   for (TabContentsIterator iterator; !iterator.done(); ++iterator, ++count) {
     if (count == 0)
       EXPECT_EQ(browser3.get(), iterator.browser());
     else
       EXPECT_TRUE(false);
   }
 
   // Now make it one tab per browser.
   chrome::NewTab(browser());
   chrome::NewTab(browser2.get());
 
   count = 0;
   for (TabContentsIterator iterator; !iterator.done(); ++iterator, ++count) {
     if (count == 0)
       EXPECT_EQ(browser(), iterator.browser());
     else if (count == 1)
       EXPECT_EQ(browser2.get(), iterator.browser());
     else if (count == 2)
       EXPECT_EQ(browser3.get(), iterator.browser());
     else
       EXPECT_TRUE(false);
   }
 
   // Close all remaining tabs to keep all the destructors happy.
-  browser2->CloseAllTabs();
-  browser3->CloseAllTabs();
+  chrome::CloseAllTabs(browser2.get());
+  chrome::CloseAllTabs(browser3.get());
 }
 
 #if 0
 // TODO(thestig) Fix or remove this test. http://crbug.com/100309
 TEST_F(BrowserListTest, TabContentsIteratorBackgroundPrinting) {
   // Make sure we have 1 window to start with.
   EXPECT_EQ(1U, BrowserList::size());
 
   // Create more browsers/windows.
   scoped_ptr<Browser> browser2(new Browser(Browser::TYPE_TABBED, profile()));
@@ skipping 23 matching lines @@
   TabContentsIterator 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();
+  chrome::CloseAllTabs(browser2.get());
+  chrome::CloseAllTabs(browser3.get());
 
   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) {
@@ skipping 50 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);
 }