Move tab functions off Browser into browser_tabstrip and browser_tabrestore.

chrome/browser/repost_form_warning_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 "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/ui/browser.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/common/chrome_notification_types.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "chrome/test/ui/ui_test.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/test_navigation_observer.h"
 #include "net/test/test_server.h"
 
 typedef InProcessBrowserTest RepostFormWarningTest;
 
 // If becomes flaky, disable on Windows and use http://crbug.com/47228
 IN_PROC_BROWSER_TEST_F(RepostFormWarningTest, TestDoubleReload) {
   ASSERT_TRUE(test_server()->Start());
 
   // Load a form.
   ui_test_utils::NavigateToURL(
       browser(), test_server()->GetURL("files/form.html"));
   // Submit it.
   ui_test_utils::NavigateToURL(
       browser(),
       GURL("javascript:document.getElementById('form').submit()"));
 
   // Try to reload it twice, checking for repost.
-  content::WebContents* web_contents = browser()->GetActiveWebContents();
+  content::WebContents* web_contents = chrome::GetActiveWebContents(browser());
   web_contents->GetController().Reload(true);
   web_contents->GetController().Reload(true);
 
   // There should only be one dialog open.
   TabContents* tab_contents = TabContents::FromWebContents(web_contents);
   size_t num_constrained_windows =
       tab_contents->constrained_window_tab_helper()->constrained_window_count();
   EXPECT_EQ(1u, num_constrained_windows);
 
   // Navigate away from the page (this is when the test usually crashes).
@@ skipping 11 matching lines @@
 
   // Load a form.
   ui_test_utils::NavigateToURL(
       browser(), test_server()->GetURL("files/form.html"));
   // Submit it.
   ui_test_utils::NavigateToURL(
       browser(),
       GURL("javascript:document.getElementById('form').submit()"));
 
   // Try to reload it, checking for repost.
-  content::WebContents* web_contents = browser()->GetActiveWebContents();
+  content::WebContents* web_contents = chrome::GetActiveWebContents(browser());
   web_contents->GetController().Reload(true);
 
   // Navigate to a page that requires authentication, bringing up another
   // tab-modal sheet.
   content::NavigationController& controller = web_contents->GetController();
   ui_test_utils::WindowedNotificationObserver observer(
       chrome::NOTIFICATION_AUTH_NEEDED,
       content::Source<content::NavigationController>(&controller));
   browser()->OpenURL(content::OpenURLParams(
         test_server()->GetURL("auth-basic"), content::Referrer(), CURRENT_TAB,
         content::PAGE_TRANSITION_TYPED, false));
   observer.Wait();
 
   // Try to reload it again.
   web_contents->GetController().Reload(true);
 
   // Navigate away from the page. We can't use ui_test_utils:NavigateToURL
   // because that waits for the current page to stop loading first, which won't
   // happen while the auth dialog is up.
   content::Source<content::NavigationController> source(&controller);
   content::TestNavigationObserver navigation_observer(source);
   browser()->OpenURL(content::OpenURLParams(
         test_server()->GetURL("bar"), content::Referrer(), CURRENT_TAB,
         content::PAGE_TRANSITION_TYPED, false));
   navigation_observer.Wait();
 }