Move tab functions off Browser into browser_tabstrip and browser_tabrestore.

chrome/browser/ui/fullscreen_controller_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/compiler_specific.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/profiles/profile.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/browser_window.h"
 #include "chrome/browser/ui/fullscreen_controller_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/url_constants.h"
 #include "content/public/test/test_navigation_observer.h"
 #if defined(OS_MACOSX)
 #include "base/mac/mac_util.h"
 #endif
@@ skipping 273 matching lines @@
 
 #if defined(OS_MACOSX)
 // http://crbug.com/100467
 IN_PROC_BROWSER_TEST_F(
     FullscreenControllerTest, FAILS_TabEntersPresentationModeFromWindowed) {
   ASSERT_TRUE(test_server()->Start());
 
   AddTabAtIndexAndWait(
       0, GURL(chrome::kAboutBlankURL), content::PAGE_TRANSITION_TYPED);
 
-  WebContents* tab = browser()->GetActiveWebContents();
+  WebContents* tab = chrome::GetActiveWebContents(browser());
 
   {
     FullscreenNotificationObserver fullscreen_observer;
     EXPECT_FALSE(browser()->window()->IsFullscreen());
     EXPECT_FALSE(browser()->window()->InPresentationMode());
     browser()->ToggleFullscreenModeForTab(tab, true);
     fullscreen_observer.Wait();
     ASSERT_TRUE(browser()->window()->IsFullscreen());
     ASSERT_TRUE(browser()->window()->InPresentationMode());
   }
@@ skipping 17 matching lines @@
   }
 }
 #endif
 
 IN_PROC_BROWSER_TEST_F(FullscreenControllerTest,
                        PendingMouseLockExitsOnTabSwitch) {
   AddTabAtIndexAndWait(0, GURL(chrome::kAboutBlankURL),
                        content::PAGE_TRANSITION_TYPED);
   AddTabAtIndexAndWait(0, GURL(chrome::kAboutBlankURL),
                        content::PAGE_TRANSITION_TYPED);
-  WebContents* tab1 = browser()->GetActiveWebContents();
+  WebContents* tab1 = chrome::GetActiveWebContents(browser());
 
   // Request mouse lock. Bubble is displayed.
   RequestToLockMouse(true, false);
   ASSERT_TRUE(IsFullscreenBubbleDisplayed());
 
   // Activate current tab. Mouse lock bubble remains.
-  browser()->ActivateTabAt(0, true);
+  chrome::ActivateTabAt(browser(), 0, true);
   ASSERT_TRUE(IsFullscreenBubbleDisplayed());
 
   // Activate second tab. Mouse lock bubble clears.
   {
     MouseLockNotificationObserver mouse_lock_observer;
-    browser()->ActivateTabAt(1, true);
+    chrome::ActivateTabAt(browser(), 1, true);
     mouse_lock_observer.Wait();
   }
   ASSERT_FALSE(IsFullscreenBubbleDisplayed());
 
   // Now, test that closing an unrelated tab does not disturb a request.
 
   // Request mouse lock. Bubble is displayed.
   RequestToLockMouse(true, false);
   ASSERT_TRUE(IsFullscreenBubbleDisplayed());
 
   // Close first tab while second active. Mouse lock bubble remains.
-  browser()->CloseTabContents(tab1);
+  chrome::CloseWebContents(browser(), tab1);
   ASSERT_TRUE(IsFullscreenBubbleDisplayed());
 }
 
 IN_PROC_BROWSER_TEST_F(FullscreenControllerTest,
                        PendingMouseLockExitsOnTabClose) {
   // Add more tabs.
   AddTabAtIndexAndWait(0, GURL(chrome::kAboutBlankURL),
                        content::PAGE_TRANSITION_TYPED);
   AddTabAtIndexAndWait(0, GURL(chrome::kAboutBlankURL),
                        content::PAGE_TRANSITION_TYPED);
 
   // Request mouse lock. Bubble is displayed.
   RequestToLockMouse(true, false);
   ASSERT_TRUE(IsFullscreenBubbleDisplayed());
 
   // Close tab. Bubble is cleared.
   {
     MouseLockNotificationObserver mouse_lock_observer;
     chrome::CloseTab(browser());
     mouse_lock_observer.Wait();
   }
   ASSERT_FALSE(IsFullscreenBubbleDisplayed());
 }