Move tab functions off Browser into browser_tabstrip and browser_tabrestore.

chrome/browser/ui/fullscreen_controller_test.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/fullscreen_controller_test.h"
 
 #include "base/command_line.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.h"
 #include "chrome/common/chrome_switches.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/test_navigation_observer.h"
 
 using content::WebContents;
 
 const char FullscreenControllerTest::kFullscreenMouseLockHTML[] =
     "files/fullscreen_mouselock/fullscreen_mouselock.html";
@@ skipping 27 matching lines @@
   browser()->ToggleFullscreenMode();
 
   fullscreen_observer.Wait();
   ASSERT_EQ(browser()->window()->IsFullscreen(), enter_fullscreen);
   ASSERT_EQ(IsFullscreenForBrowser(), enter_fullscreen);
 }
 
 void FullscreenControllerTest::RequestToLockMouse(
     bool user_gesture,
     bool last_unlocked_by_target) {
-  WebContents* tab = browser()->GetActiveWebContents();
+  WebContents* tab = chrome::GetActiveWebContents(browser());
   browser()->RequestToLockMouse(tab, user_gesture,
       last_unlocked_by_target);
 }
 
 void FullscreenControllerTest::LostMouseLock() {
   browser()->LostMouseLock();
 }
 
 bool FullscreenControllerTest::SendEscapeToFullscreenController() {
   return browser()->fullscreen_controller_->HandleUserPressedEscape();
@@ skipping 34 matching lines @@
   return type != FEB_TYPE_NONE;
 }
 
 bool FullscreenControllerTest::IsFullscreenBubbleDisplayingButtons() {
   FullscreenExitBubbleType type =
       browser()->fullscreen_controller_->GetFullscreenExitBubbleType();
   return fullscreen_bubble::ShowButtonsForType(type);
 }
 
 void FullscreenControllerTest::AcceptCurrentFullscreenOrMouseLockRequest() {
-  WebContents* fullscreen_tab = browser()->GetActiveWebContents();
+  WebContents* fullscreen_tab = chrome::GetActiveWebContents(browser());
   FullscreenExitBubbleType type =
       browser()->fullscreen_controller_->GetFullscreenExitBubbleType();
   browser()->OnAcceptFullscreenPermission(fullscreen_tab->GetURL(), type);
 }
 
 void FullscreenControllerTest::DenyCurrentFullscreenOrMouseLockRequest() {
   FullscreenExitBubbleType type =
       browser()->fullscreen_controller_->GetFullscreenExitBubbleType();
   browser()->OnDenyFullscreenPermission(type);
 }
@@ skipping 21 matching lines @@
   content::TestNavigationObserver observer(
       content::NotificationService::AllSources(), NULL, 1);
 
   chrome::Reload(browser(), CURRENT_TAB);
 
   observer.Wait();
 }
 
 void FullscreenControllerTest::ToggleTabFullscreen_Internal(
     bool enter_fullscreen, bool retry_until_success) {
-  WebContents* tab = browser()->GetActiveWebContents();
+  WebContents* tab = chrome::GetActiveWebContents(browser());
   if (IsFullscreenForBrowser()) {
     // Changing tab fullscreen state will not actually change the window
     // when browser fullscreen is in effect.
     browser()->ToggleFullscreenModeForTab(tab, enter_fullscreen);
   } else {  // Not in browser fullscreen, expect window to actually change.
     ASSERT_NE(browser()->window()->IsFullscreen(), enter_fullscreen);
     do {
       FullscreenNotificationObserver fullscreen_observer;
       browser()->ToggleFullscreenModeForTab(tab, enter_fullscreen);
       fullscreen_observer.Wait();
       // Repeat ToggleFullscreenModeForTab until the correct state is entered.
       // This addresses flakiness on test bots running many fullscreen
       // tests in parallel.
     } while (retry_until_success &&
              browser()->window()->IsFullscreen() != enter_fullscreen);
     ASSERT_EQ(browser()->window()->IsFullscreen(), enter_fullscreen);
   }
 }