Move tab functions off Browser into browser_tabstrip and browser_tabrestore.

chrome/browser/ui/webui/print_preview/print_preview_ui_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 <vector>
 
 #include "base/memory/ref_counted_memory.h"
 #include "chrome/browser/printing/print_preview_tab_controller.h"
 #include "chrome/browser/printing/print_preview_unit_test_base.h"
 #include "chrome/browser/printing/print_view_manager.h"
 #include "chrome/browser/ui/browser_commands.h"
+#include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/constrained_window_tab_helper.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/webui/print_preview/print_preview_ui.h"
 #include "content/public/browser/site_instance.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/web_contents_tester.h"
 #include "printing/print_job_constants.h"
 
 using content::WebContents;
 using content::WebContentsTester;
@@ skipping 17 matching lines @@
  protected:
   virtual void SetUp() OVERRIDE {
     PrintPreviewUnitTestBase::SetUp();
 
     chrome::NewTab(browser());
   }
 };
 
 // Create/Get a preview tab for initiator tab.
 TEST_F(PrintPreviewUIUnitTest, PrintPreviewData) {
-  TabContents* initiator_tab = browser()->GetActiveTabContents();
+  TabContents* initiator_tab = chrome::GetActiveTabContents(browser());
   ASSERT_TRUE(initiator_tab);
   EXPECT_EQ(0U, GetConstrainedWindowCount(initiator_tab));
 
   printing::PrintPreviewTabController* controller =
       printing::PrintPreviewTabController::GetInstance();
   ASSERT_TRUE(controller);
 
   initiator_tab->print_view_manager()->PrintPreviewNow();
   TabContents* preview_tab = controller->GetOrCreatePreviewTab(initiator_tab);
 
@@ skipping 33 matching lines @@
   preview_ui->ClearAllPreviewData();
 
   preview_ui->GetPrintPreviewDataForIndex(
       printing::COMPLETE_PREVIEW_DOCUMENT_INDEX,
       &data);
   EXPECT_EQ(NULL, data.get());
 }
 
 // Set and get the individual draft pages.
 TEST_F(PrintPreviewUIUnitTest, PrintPreviewDraftPages) {
-  TabContents* initiator_tab = browser()->GetActiveTabContents();
+  TabContents* initiator_tab = chrome::GetActiveTabContents(browser());
   ASSERT_TRUE(initiator_tab);
 
   printing::PrintPreviewTabController* controller =
       printing::PrintPreviewTabController::GetInstance();
   ASSERT_TRUE(controller);
 
   initiator_tab->print_view_manager()->PrintPreviewNow();
   TabContents* preview_tab = controller->GetOrCreatePreviewTab(initiator_tab);
 
   EXPECT_NE(initiator_tab, preview_tab);
@@ skipping 39 matching lines @@
   EXPECT_EQ(dummy_data.get(), data.get());
 
   // Clear the preview data.
   preview_ui->ClearAllPreviewData();
   preview_ui->GetPrintPreviewDataForIndex(printing::FIRST_PAGE_INDEX, &data);
   EXPECT_EQ(NULL, data.get());
 }
 
 // Test the browser-side print preview cancellation functionality.
 TEST_F(PrintPreviewUIUnitTest, GetCurrentPrintPreviewStatus) {
-  TabContents* initiator_tab = browser()->GetActiveTabContents();
+  TabContents* initiator_tab = chrome::GetActiveTabContents(browser());
   ASSERT_TRUE(initiator_tab);
 
   printing::PrintPreviewTabController* controller =
       printing::PrintPreviewTabController::GetInstance();
   ASSERT_TRUE(controller);
 
   initiator_tab->print_view_manager()->PrintPreviewNow();
   TabContents* preview_tab = controller->GetOrCreatePreviewTab(initiator_tab);
 
   EXPECT_NE(initiator_tab, preview_tab);
@@ skipping 37 matching lines @@
                                            &cancel);
   EXPECT_FALSE(cancel);
 }
 
 TEST_F(PrintPreviewUIUnitTest, InitiatorTabGetsFocusOnPrintPreviewTabClose) {
   EXPECT_EQ(1, browser()->tab_count());
   WebContents* initiator_contents =
       WebContentsTester::CreateTestWebContentsCountFocus(profile(), NULL);
   WebContentsTester* initiator_tester =
       WebContentsTester::For(initiator_contents);
-  browser()->AddWebContents(initiator_contents,
-                            NEW_FOREGROUND_TAB,
-                            gfx::Rect(),
-                            false);
+  chrome::AddWebContents(browser(), NULL, initiator_contents,
+                         NEW_FOREGROUND_TAB, gfx::Rect(), false);
   TabContents* initiator_tab = TabContents::FromWebContents(initiator_contents);
   ASSERT_TRUE(initiator_tab);
   EXPECT_EQ(2, browser()->tab_count());
   EXPECT_EQ(0, initiator_tester->GetNumberOfFocusCalls());
 
   printing::PrintPreviewTabController* controller =
       printing::PrintPreviewTabController::GetInstance();
   ASSERT_TRUE(controller);
 
   initiator_tab->print_view_manager()->PrintPreviewNow();
   TabContents* preview_tab = controller->GetOrCreatePreviewTab(initiator_tab);
 
   EXPECT_NE(initiator_tab, preview_tab);
   EXPECT_EQ(2, browser()->tab_count());
   EXPECT_EQ(1U, GetConstrainedWindowCount(initiator_tab));
   EXPECT_EQ(0, initiator_tester->GetNumberOfFocusCalls());
 
   PrintPreviewUI* preview_ui = static_cast<PrintPreviewUI*>(
       preview_tab->web_contents()->GetWebUI()->GetController());
   ASSERT_TRUE(preview_ui != NULL);
 
   preview_ui->OnPrintPreviewTabClosed();
 
   EXPECT_EQ(2, browser()->tab_count());
   EXPECT_EQ(0U, GetConstrainedWindowCount(initiator_tab));
   EXPECT_EQ(1, initiator_tester->GetNumberOfFocusCalls());
 }