Move tab functions off Browser into browser_tabstrip and browser_tabrestore.

chrome/browser/instant/instant_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/command_line.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/instant/instant_controller.h"
 #include "chrome/browser/instant/instant_loader.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/task_manager/task_manager.h"
 #include "chrome/browser/task_manager/task_manager_browsertest_util.h"
 #include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/omnibox/location_bar.h"
 #include "chrome/browser/ui/omnibox/omnibox_edit_model.h"
 #include "chrome/browser/ui/omnibox/omnibox_view.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/in_process_browser_test.h"
@@ skipping 283 matching lines @@
 
   WebContents* preview_tab = preview()->web_contents();
   EXPECT_TRUE(preview_tab);
 
   ASSERT_TRUE(PressEnter());
 
   // Check that the preview has been committed.
   EXPECT_FALSE(preview());
   EXPECT_FALSE(instant()->is_displayable());
   EXPECT_FALSE(instant()->IsCurrent());
-  EXPECT_EQ(preview_tab, browser()->GetActiveWebContents());
+  EXPECT_EQ(preview_tab, chrome::GetActiveWebContents(browser()));
 
   // We should have two entries. One corresponding to the page the user was
   // first on, and one for the search page.
   EXPECT_EQ(2, preview_tab->GetController().GetEntryCount());
 
   // Check that the value is reflected and onsubmit is called.
   EXPECT_EQ("true 1 0 1 true d false defghi true 3 3",
             GetSearchStateAsString(preview_tab, true));
 
   // Make sure the searchbox values were reset.
@@ skipping 17 matching lines @@
   WebContents* preview_tab = preview()->web_contents();
   EXPECT_TRUE(preview_tab);
 
   ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser()));
   ui_test_utils::ClickOnView(browser(), VIEW_ID_TAB_CONTAINER);
 
   // Check that the preview has been committed.
   EXPECT_FALSE(preview());
   EXPECT_FALSE(instant()->is_displayable());
   EXPECT_FALSE(instant()->IsCurrent());
-  EXPECT_EQ(preview_tab, browser()->GetActiveWebContents());
+  EXPECT_EQ(preview_tab, chrome::GetActiveWebContents(browser()));
 
   // Check that the value is reflected and oncancel is called.
   EXPECT_EQ("true 0 1 1 true d false def false 3 3",
             GetSearchStateAsString(preview_tab, true));
 
   // Make sure the searchbox values were reset.
   EXPECT_EQ("true 0 1 1 true d false  false 0 0",
             GetSearchStateAsString(preview_tab, false));
 }
 
@@ skipping 342 matching lines @@
   std::string value;
   ASSERT_TRUE(GetStringFromJavascript(preview()->web_contents(),
       "window.chrome.searchBox.value", &value));
   EXPECT_EQ("def", value);
 
   // Commit the preview.
   ASSERT_TRUE(PressEnter());
   EXPECT_FALSE(preview());
 
   // The searchBox actually gets cleared on commit.
-  ASSERT_TRUE(GetStringFromJavascript(browser()->GetActiveWebContents(),
+  ASSERT_TRUE(GetStringFromJavascript(chrome::GetActiveWebContents(browser()),
       "window.chrome.searchBox.value", &value));
   EXPECT_EQ("", value);
 
   // Navigate to a new URL. The searchBox values should stay cleared.
   ui_test_utils::NavigateToURL(
       browser(), test_server()->GetURL("files/empty.html"));
 
-  ASSERT_TRUE(GetStringFromJavascript(browser()->GetActiveWebContents(),
+  ASSERT_TRUE(GetStringFromJavascript(chrome::GetActiveWebContents(browser()),
       "window.chrome.searchBox.value", &value));
   EXPECT_EQ("", value);
 }
 
 // Tests that instant search is preloaded whenever the omnibox gets focus.
 // PreloadsInstant fails on linux_chromeos trybots all the time, possibly
 // because of http://crbug.com/80118.
 #if defined(OS_CHROMEOS) || defined(OS_MACOSX)
 IN_PROC_BROWSER_TEST_F(InstantTest, DISABLED_PreloadsInstant) {
 #else
@@ skipping 42 matching lines @@
 }
 
 // Tests that the instant search page's visibility is set correctly.
 IN_PROC_BROWSER_TEST_F(InstantTest, MAYBE(PageVisibilityTest)) {
   ASSERT_TRUE(test_server()->Start());
   EnableInstant();
   SetupInstantProvider("instant.html");
 
   // Initially navigate to the empty page which should be visible.
   ui_test_utils::NavigateToURL(browser(), test_server()->GetURL(""));
-  WebContents* initial_contents = browser()->GetActiveWebContents();
+  WebContents* initial_contents = chrome::GetActiveWebContents(browser());
 
   ASSERT_TRUE(CheckVisibilityIs(initial_contents, true));
 
   // Type a search term and wait for the preview to appear.
   browser()->window()->GetLocationBar()->FocusLocation(false);
   DetermineInstantSupport();
   SearchAndWaitForPreviewToShow();
   WebContents* preview_contents = preview()->web_contents();
 
   ASSERT_TRUE(CheckVisibilityIs(preview_contents, true));
   ASSERT_TRUE(CheckVisibilityIs(initial_contents, false));
 
   // Deleting the user text should hide the preview.
   omnibox()->SetUserText(string16());
   ASSERT_TRUE(CheckVisibilityIs(preview_contents, false));
   ASSERT_TRUE(CheckVisibilityIs(initial_contents, true));
 
   // Set the user text back and we should see the preview again.
   omnibox()->SetUserText(ASCIIToUTF16("def"));
   ASSERT_TRUE(CheckVisibilityIs(preview_contents, true));
   ASSERT_TRUE(CheckVisibilityIs(initial_contents, false));
 
   // Commit the preview.
   ASSERT_TRUE(PressEnter());
-  EXPECT_EQ(preview_contents, browser()->GetActiveWebContents());
+  EXPECT_EQ(preview_contents, chrome::GetActiveWebContents(browser()));
   ASSERT_TRUE(CheckVisibilityIs(preview_contents, true));
 }
 
 // Tests that the task manager identifies instant's preview tab correctly.
 IN_PROC_BROWSER_TEST_F(InstantTest, MAYBE(TaskManagerPrefix)) {
   // The browser starts with one new tab, so the task manager should have two
   // rows initially, one for the browser process and one for tab's renderer.
   TaskManagerModel* task_manager = TaskManager::GetInstance()->model();
   task_manager->StartUpdating();
   TaskManagerBrowserTestUtil::WaitForResourceChange(2);
 
   ASSERT_TRUE(test_server()->Start());
   EnableInstant();
   SetupInstantProvider("instant.html");
   DetermineInstantSupport();
   SearchAndWaitForPreviewToShow();
 
   // Now there should be three rows, the third being the instant preview.
   TaskManagerBrowserTestUtil::WaitForResourceChange(3);
   string16 prefix = l10n_util::GetStringFUTF16(
       IDS_TASK_MANAGER_INSTANT_PREVIEW_PREFIX, string16());
   string16 title = task_manager->GetResourceTitle(2);
   EXPECT_TRUE(StartsWith(title, prefix, true)) << title << " vs " << prefix;
 }