Move tab functions off Browser into browser_tabstrip and browser_tabrestore.

chrome/browser/ui/views/constrained_window_views_browsertest.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 "base/memory/weak_ptr.h"
 #include "chrome/browser/ui/browser.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/views/constrained_window_views.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "ui/base/accelerators/accelerator.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/focus/focus_manager.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/window/dialog_delegate.h"
@@ skipping 80 matching lines @@
   }
 };
 
 // Tests the following:
 //
 // *) Initially focused view in a constrained dialog receives focus reliably.
 //
 // *) Constrained windows that are queued don't register themselves as
 //    accelerator targets until they are displayed.
 IN_PROC_BROWSER_TEST_F(ConstrainedWindowViewTest, FocusTest) {
-  TabContents* tab_contents = browser()->GetActiveTabContents();
+  TabContents* tab_contents = chrome::GetActiveTabContents(browser());
   ASSERT_TRUE(tab_contents != NULL);
   ConstrainedWindowTabHelper* constrained_window_helper =
       tab_contents->constrained_window_tab_helper();
   ASSERT_TRUE(constrained_window_helper != NULL);
 
   // Create a constrained dialog.  It will attach itself to tab_contents.
   scoped_ptr<TestConstrainedDialog> test_dialog1(new TestConstrainedDialog);
   ConstrainedWindowViews* window1 =
       new ConstrainedWindowViews(tab_contents, test_dialog1.get());
 
@@ skipping 34 matching lines @@
 
   int tab_with_constrained_window = browser()->active_index();
 
   // Create a new tab.
   chrome::NewTab(browser());
 
   // The constrained dialog should no longer be selected.
   EXPECT_NE(test_dialog2->GetInitiallyFocusedView(),
             focus_manager->GetFocusedView());
 
-  browser()->ActivateTabAt(tab_with_constrained_window, false);
+  chrome::ActivateTabAt(browser(), tab_with_constrained_window, false);
 
   // Activating the previous tab should bring focus to the constrained window.
   EXPECT_EQ(test_dialog2->GetInitiallyFocusedView(),
             focus_manager->GetFocusedView());
 
   // Send another VKEY_RETURN, closing test_dialog2
   EXPECT_TRUE(focus_manager->ProcessAccelerator(
       ui::Accelerator(ui::VKEY_RETURN, ui::EF_NONE)));
   ui_test_utils::RunAllPendingInMessageLoop();
   EXPECT_TRUE(test_dialog2->done());
   EXPECT_EQ(0u, constrained_window_helper->constrained_window_count());
 }