| Index: chrome/browser/ui/tab_contents/tab_contents_iterator_unittest.cc
|
| ===================================================================
|
| --- chrome/browser/ui/tab_contents/tab_contents_iterator_unittest.cc (revision 145001)
|
| +++ chrome/browser/ui/tab_contents/tab_contents_iterator_unittest.cc (working copy)
|
| @@ -11,6 +11,7 @@
|
| #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"
|
| @@ -78,7 +79,7 @@
|
| EXPECT_EQ(4U, CountAllTabs());
|
|
|
| // Close some tabs.
|
| - browser2->CloseAllTabs();
|
| + chrome::CloseAllTabs(browser2.get());
|
|
|
| EXPECT_EQ(1U, CountAllTabs());
|
|
|
| @@ -88,7 +89,7 @@
|
|
|
| EXPECT_EQ(42U, CountAllTabs());
|
| // Close all remaining tabs to keep all the destructors happy.
|
| - browser3->CloseAllTabs();
|
| + chrome::CloseAllTabs(browser3.get());
|
| }
|
|
|
| TEST_F(BrowserListTest, TabContentsIteratorVerifyBrowser) {
|
| @@ -129,7 +130,7 @@
|
| }
|
|
|
| // Close some tabs.
|
| - browser2->CloseAllTabs();
|
| + chrome::CloseAllTabs(browser2.get());
|
|
|
| count = 0;
|
| for (TabContentsIterator iterator; !iterator.done(); ++iterator, ++count) {
|
| @@ -156,8 +157,8 @@
|
| }
|
|
|
| // Close all remaining tabs to keep all the destructors happy.
|
| - browser2->CloseAllTabs();
|
| - browser3->CloseAllTabs();
|
| + chrome::CloseAllTabs(browser2.get());
|
| + chrome::CloseAllTabs(browser3.get());
|
| }
|
|
|
| #if 0
|
| @@ -201,8 +202,8 @@
|
| EXPECT_EQ(4U, CountAllTabs());
|
|
|
| // Close remaining tabs.
|
| - browser2->CloseAllTabs();
|
| - browser3->CloseAllTabs();
|
| + chrome::CloseAllTabs(browser2.get());
|
| + chrome::CloseAllTabs(browser3.get());
|
|
|
| EXPECT_EQ(1U, CountAllTabs());
|
|
|
|
|