Move tab functions off Browser into browser_tabstrip and browser_tabrestore.

chrome/browser/unload_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.
 
 #if defined(OS_POSIX)
 #include <signal.h>
 #endif
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/process_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/net/url_request_mock_util.h"
 #include "chrome/browser/ui/app_modal_dialogs/javascript_app_modal_dialog.h"
 #include "chrome/browser/ui/app_modal_dialogs/native_app_modal_dialog.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_list.h"
+#include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/web_contents.h"
 #include "content/test/net/url_request_mock_http_job.h"
 #include "net/url_request/url_request_test_util.h"
 
@@ skipping 92 matching lines @@
   }
 
   virtual void SetUpOnMainThread() OVERRIDE {
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE,
         base::Bind(&chrome_browser_net::SetUrlRequestMocksEnabled, true));
   }
 
   void CheckTitle(const char* expected_title) {
     string16 expected = ASCIIToUTF16(expected_title);
-    EXPECT_EQ(expected, browser()->GetActiveWebContents()->GetTitle());
+    EXPECT_EQ(expected, chrome::GetActiveWebContents(browser())->GetTitle());
   }
 
   void NavigateToDataURL(const std::string& html_content,
                          const char* expected_title) {
     ui_test_utils::NavigateToURL(browser(),
                                  GURL("data:text/html," + html_content));
     CheckTitle(expected_title);
   }
 
   void NavigateToNolistenersFileTwice() {
@@ skipping 126 matching lines @@
 IN_PROC_BROWSER_TEST_F(UnloadTest, BrowserCloseBeforeUnloadCancel) {
   NavigateToDataURL(BEFORE_UNLOAD_HTML, "beforeunload");
   chrome::CloseWindow(browser());
 
   // We wait for the title to change after cancelling the popup to ensure that
   // in-flight IPCs from the renderer reach the browser. Otherwise the browser
   // won't put up the beforeunload dialog because it's waiting for an ack from
   // the renderer.
   string16 expected_title = ASCIIToUTF16("cancelled");
   ui_test_utils::TitleWatcher title_watcher(
-      browser()->GetActiveWebContents(), expected_title);
+      chrome::GetActiveWebContents(browser()), expected_title);
   ClickModalDialogButton(false);
   ASSERT_EQ(expected_title, title_watcher.WaitAndGetTitle());
 
   ui_test_utils::WindowedNotificationObserver window_observer(
         chrome::NOTIFICATION_BROWSER_CLOSED,
         content::NotificationService::AllSources());
   chrome::CloseWindow(browser());
   ClickModalDialogButton(true);
   window_observer.Wait();
 }
@@ skipping 94 matching lines @@
 
   // Simulate a click to force user_gesture to true; if we don't, the resulting
   // popup will be constrained, which isn't what we want to test.
 
   ui_test_utils::WindowedNotificationObserver observer(
         chrome::NOTIFICATION_TAB_ADDED,
         content::NotificationService::AllSources());
   ui_test_utils::WindowedNotificationObserver load_stop_observer(
       content::NOTIFICATION_LOAD_STOP,
       content::NotificationService::AllSources());
-  ui_test_utils::SimulateMouseClick(browser()->GetActiveWebContents());
+  ui_test_utils::SimulateMouseClick(chrome::GetActiveWebContents(browser()));
   observer.Wait();
   load_stop_observer.Wait();
   CheckTitle("popup");
 
   ui_test_utils::WindowedNotificationObserver tab_close_observer(
       content::NOTIFICATION_WEB_CONTENTS_DESTROYED,
       content::NotificationService::AllSources());
   chrome::CloseTab(browser());
   tab_close_observer.Wait();
 
   CheckTitle("only_one_unload");
 }
 
 // TODO(ojan): Add tests for unload/beforeunload that have multiple tabs
 // and multiple windows.