Replace most of Browser::GetSelectedTabContents calls into Browser::GetSelectedWebContents. I've ...

chrome/browser/instant/instant_browsertest.cc

 // Copyright (c) 2011 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/autocomplete/autocomplete_edit.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
@@ skipping 12 matching lines @@
 #include "chrome/browser/ui/omnibox/omnibox_view.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.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"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/renderer_host/render_widget_host_view.h"
-#include "content/browser/tab_contents/tab_contents.h"
+#include "content/browser/tab_contents/navigation_controller.h"
 #include "content/public/browser/notification_service.h"
+#include "content/public/browser/web_contents.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
+using content::WebContents;
+
 // Tests are flaky on Linux because of http://crbug.com/80118.
 #if defined(OS_LINUX)
 #define MAYBE(TestName) DISABLED_ ## TestName
 #else
 #define MAYBE(TestName) TestName
 #endif
 
 class InstantTest : public InProcessBrowserTest {
  public:
   InstantTest() {
@@ skipping 51 matching lines @@
         chrome::NOTIFICATION_INSTANT_CONTROLLER_SHOWN,
         content::NotificationService::AllSources());
     omnibox()->SetUserText(ASCIIToUTF16("def"));
     observer.Wait();
   }
 
   // Sends a message to the renderer and waits for the response to come back to
   // the browser. Returns true on success.
   bool WaitForMessageToBeProcessedByRenderer() {
     bool result = false;
-    return GetBoolFromJavascript(preview()->tab_contents(), "true", &result) &&
+    return GetBoolFromJavascript(preview()->web_contents(), "true", &result) &&
            result;
   }
 
   InstantController* instant() const {
     return browser()->instant();
   }
 
   OmniboxView* omnibox() const {
     return browser()->window()->GetLocationBar()->location_entry();
   }
@@ skipping 11 matching lines @@
   }
 
   bool PressEnter() {
     return ui_test_utils::SendKeyPressSync(
         browser(), ui::VKEY_RETURN, false, false, false, false);
   }
 
   bool SetSuggestionsJavascriptArgument(const std::string& argument) {
     std::wstring script = UTF8ToWide(base::StringPrintf(
         "window.setSuggestionsArgument = %s;", argument.c_str()));
-    RenderViewHost* rvh = preview()->tab_contents()->GetRenderViewHost();
+    RenderViewHost* rvh = preview()->web_contents()->GetRenderViewHost();
     return ui_test_utils::ExecuteJavaScript(rvh, std::wstring(), script);
   }
 
   std::wstring WrapScript(const std::string& script) {
     return UTF8ToWide(base::StringPrintf(
         "window.domAutomationController.send(%s)", script.c_str()));
   }
 
-  bool GetStringFromJavascript(TabContents* tab,
+  bool GetStringFromJavascript(WebContents* tab,
                                const std::string& script,
                                std::string* result) {
     return ui_test_utils::ExecuteJavaScriptAndExtractString(
         tab->GetRenderViewHost(), std::wstring(), WrapScript(script), result);
   }
 
-  bool GetIntFromJavascript(TabContents* tab,
+  bool GetIntFromJavascript(WebContents* tab,
                             const std::string& script,
                             int* result) {
     return ui_test_utils::ExecuteJavaScriptAndExtractInt(
         tab->GetRenderViewHost(), std::wstring(), WrapScript(script), result);
   }
 
-  bool GetBoolFromJavascript(TabContents* tab,
+  bool GetBoolFromJavascript(WebContents* tab,
                              const std::string& script,
                              bool* result) {
     return ui_test_utils::ExecuteJavaScriptAndExtractBool(
         tab->GetRenderViewHost(), std::wstring(), WrapScript(script), result);
   }
 
-  bool CheckVisibilityIs(TabContents* tab, bool visible) {
+  bool CheckVisibilityIs(WebContents* tab, bool visible) {
     bool hidden = visible;
     return GetBoolFromJavascript(tab, "document.webkitHidden", &hidden) &&
            hidden != visible;
   }
 
   // Returns the state of the search box as a string. This consists of the
   // following:
   // window.chrome.sv
   // window.onsubmitcalls
   // window.oncancelcalls
   // window.onchangecalls
   // 'true' if any window.onresize call has been sent, otherwise false.
   // window.beforeLoadSearchBox.value
   // window.beforeLoadSearchBox.verbatim
   // window.chrome.searchBox.value
   // window.chrome.searchBox.verbatim
   // window.chrome.searchBox.selectionStart
   // window.chrome.searchBox.selectionEnd
   // If determining any of the values fails, the value is 'fail'.
   //
   // If |use_last| is true, then the last searchBox values are used instead of
   // the current. Set |use_last| to true when testing OnSubmit/OnCancel.
-  std::string GetSearchStateAsString(TabContents* tab, bool use_last) {
+  std::string GetSearchStateAsString(WebContents* tab, bool use_last) {
     bool sv = false;
     int onsubmitcalls = 0;
     int oncancelcalls = 0;
     int onchangecalls = 0;
     int onresizecalls = 0;
     int selection_start = 0;
     int selection_end = 0;
     std::string before_load_value;
     bool before_load_verbatim = false;
     std::string value;
@@ skipping 73 matching lines @@
       TemplateURLServiceFactory::GetForProfile(browser()->profile())->
       GetDefaultSearchProvider();
   EXPECT_TRUE(default_turl);
   EXPECT_TRUE(default_turl->url());
   EXPECT_EQ(default_turl->url()->ReplaceSearchTerms(
                 *default_turl, ASCIIToUTF16("defghi"), 0, string16()),
             loader()->url().spec());
 
   // Check that the value is reflected and onchange is called.
   EXPECT_EQ("true 0 0 1 true d false def false 3 3",
-            GetSearchStateAsString(preview()->tab_contents(), false));
+            GetSearchStateAsString(preview()->web_contents(), false));
 }
 
 // Verify that the onsubmit event is dispatched upon pressing <Enter>.
 IN_PROC_BROWSER_TEST_F(InstantTest, MAYBE(OnSubmitEvent)) {
   ASSERT_TRUE(test_server()->Start());
   EnableInstant();
   SetupInstantProvider("instant.html");
   DetermineInstantSupport();
   SearchAndWaitForPreviewToShow();
 
   EXPECT_TRUE(preview());
   EXPECT_TRUE(instant()->is_displayable());
   EXPECT_TRUE(instant()->IsCurrent());
   EXPECT_EQ("defghi", UTF16ToUTF8(omnibox()->GetText()));
 
-  TabContents* preview_tab = preview()->tab_contents();
+  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()->GetSelectedTabContents());
+  EXPECT_EQ(preview_tab, browser()->GetSelectedWebContents());
 
   // 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.
   EXPECT_EQ("true 1 0 1 true d false  false 0 0",
             GetSearchStateAsString(preview_tab, false));
 }
 
 // Verify that the oncancel event is dispatched upon losing focus.
 IN_PROC_BROWSER_TEST_F(InstantTest, MAYBE(OnCancelEvent)) {
   ASSERT_TRUE(test_server()->Start());
   EnableInstant();
   SetupInstantProvider("instant.html");
   DetermineInstantSupport();
   SearchAndWaitForPreviewToShow();
 
   EXPECT_TRUE(preview());
   EXPECT_TRUE(instant()->is_displayable());
   EXPECT_TRUE(instant()->IsCurrent());
   EXPECT_EQ("defghi", UTF16ToUTF8(omnibox()->GetText()));
 
-  TabContents* preview_tab = preview()->tab_contents();
+  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()->GetSelectedTabContents());
+  EXPECT_EQ(preview_tab, browser()->GetSelectedWebContents());
 
   // 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 197 matching lines @@
   // trigger an onchange ourselves.
   SearchAndWaitForPreviewToShow();
 
   // We should now be showing the preview.
   EXPECT_TRUE(preview());
   EXPECT_TRUE(loader()->ready());
   EXPECT_TRUE(instant()->is_displayable());
   EXPECT_TRUE(instant()->IsCurrent());
 
   RenderWidgetHostView* rwhv =
-      preview()->tab_contents()->GetRenderWidgetHostView();
+      preview()->web_contents()->GetRenderWidgetHostView();
   EXPECT_TRUE(rwhv);
   EXPECT_TRUE(rwhv->IsShowing());
 }
 
 // Transition from search to non-search and make sure instant isn't displayable.
 // See bug http://crbug.com/100368 for details.
 IN_PROC_BROWSER_TEST_F(InstantTest, MAYBE(SearchToNonSearch)) {
   ASSERT_TRUE(test_server()->Start());
   EnableInstant();
   SetupInstantProvider("instant.html");
@@ skipping 14 matching lines @@
 
   // We should now have a preview, but it shouldn't be showing yet.
   EXPECT_TRUE(preview());
   EXPECT_FALSE(loader()->ready());
   EXPECT_FALSE(instant()->is_displayable());
   EXPECT_FALSE(instant()->IsCurrent());
 
   // Send onchange so that the page sends up suggestions. See the comments in
   // NonSearchToSearch for why this is needed.
   ASSERT_TRUE(ui_test_utils::ExecuteJavaScript(
-      preview()->tab_contents()->GetRenderViewHost(), std::wstring(),
+      preview()->web_contents()->GetRenderViewHost(), std::wstring(),
       L"window.chrome.searchBox.onchange();"));
   ASSERT_TRUE(WaitForMessageToBeProcessedByRenderer());
 
   // Instant should be active, but not displaying.
   EXPECT_TRUE(preview());
   EXPECT_TRUE(loader()->ready());
   EXPECT_FALSE(instant()->is_displayable());
   EXPECT_FALSE(instant()->IsCurrent());
 }
 
@@ skipping 48 matching lines @@
 IN_PROC_BROWSER_TEST_F(InstantTest, MAYBE(ValidHeight)) {
   ASSERT_TRUE(test_server()->Start());
   EnableInstant();
   SetupInstantProvider("instant.html");
   DetermineInstantSupport();
   SearchAndWaitForPreviewToShow();
 
   int height = -1;
 
   // searchBox height is not yet set during initial load.
-  ASSERT_TRUE(GetIntFromJavascript(preview()->tab_contents(),
+  ASSERT_TRUE(GetIntFromJavascript(preview()->web_contents(),
       "window.beforeLoadSearchBox.height", &height));
   EXPECT_EQ(0, height);
 
   // searchBox height is available by the time the page loads.
-  ASSERT_TRUE(GetIntFromJavascript(preview()->tab_contents(),
+  ASSERT_TRUE(GetIntFromJavascript(preview()->web_contents(),
       "window.chrome.searchBox.height", &height));
   EXPECT_GT(height, 0);
 }
 
 // Make sure the renderer doesn't crash if javascript is blocked.
 IN_PROC_BROWSER_TEST_F(InstantTest, MAYBE(DontCrashOnBlockedJS)) {
   browser()->profile()->GetHostContentSettingsMap()->SetDefaultContentSetting(
       CONTENT_SETTINGS_TYPE_JAVASCRIPT, CONTENT_SETTING_BLOCK);
   ASSERT_TRUE(test_server()->Start());
   EnableInstant();
   SetupInstantProvider("instant.html");
 
   // Wait for notification that the instant API has been determined. As long as
   // we get the notification we're good (the renderer didn't crash).
   DetermineInstantSupport();
 }
 
 // Makes sure window.chrome.searchbox doesn't persist when a new page is loaded.
 IN_PROC_BROWSER_TEST_F(InstantTest, MAYBE(DontPersistSearchbox)) {
   ASSERT_TRUE(test_server()->Start());
   EnableInstant();
   SetupInstantProvider("instant.html");
   DetermineInstantSupport();
   SearchAndWaitForPreviewToShow();
 
   std::string value;
-  ASSERT_TRUE(GetStringFromJavascript(preview()->tab_contents(),
+  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()->GetSelectedTabContents(),
+  ASSERT_TRUE(GetStringFromJavascript(browser()->GetSelectedWebContents(),
       "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()->GetSelectedTabContents(),
+  ASSERT_TRUE(GetStringFromJavascript(browser()->GetSelectedWebContents(),
       "window.chrome.searchBox.value", &value));
   EXPECT_EQ("", value);
 }
 
 // Tests that instant search is preloaded whenever the omnibox gets focus.
 IN_PROC_BROWSER_TEST_F(InstantTest, MAYBE(PreloadsInstant)) {
   CommandLine::ForCurrentProcess()->AppendSwitch(
       switches::kPreloadInstantSearch);
   ASSERT_TRUE(test_server()->Start());
   EnableInstant();
@@ skipping 13 matching lines @@
   ui_test_utils::WindowedNotificationObserver instant_support_observer(
       chrome::NOTIFICATION_INSTANT_SUPPORT_DETERMINED,
       content::NotificationService::AllSources());
   browser()->window()->GetLocationBar()->FocusLocation(false);
   instant_support_observer.Wait();
 
   // Instant should have a preview, but not display it.
   EXPECT_TRUE(preview());
   EXPECT_FALSE(instant()->is_displayable());
   EXPECT_FALSE(instant()->IsCurrent());
-  ASSERT_TRUE(CheckVisibilityIs(preview()->tab_contents(), false));
+  ASSERT_TRUE(CheckVisibilityIs(preview()->web_contents(), false));
 
   // Adding a new tab shouldn't delete (or recreate) the TabContentsWrapper.
   TabContentsWrapper* preview_tab = preview();
   AddBlankTabAndShow(browser());
   EXPECT_EQ(preview_tab, preview());
 
   // Doing a search should still use the same loader for the preview.
   SearchAndWaitForPreviewToShow();
   EXPECT_EQ(preview_tab, preview());
 
   // Verify that the preview is in fact showing instant search.
   EXPECT_TRUE(instant()->is_displayable());
   EXPECT_TRUE(instant()->IsCurrent());
-  ASSERT_TRUE(CheckVisibilityIs(preview()->tab_contents(), true));
+  ASSERT_TRUE(CheckVisibilityIs(preview()->web_contents(), true));
 }
 
 // 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(""));
-  TabContents* initial_contents = browser()->GetSelectedTabContents();
+  WebContents* initial_contents = browser()->GetSelectedWebContents();
 
   ASSERT_TRUE(CheckVisibilityIs(initial_contents, true));
 
   // Type a search term and wait for the preview to appear.
   browser()->window()->GetLocationBar()->FocusLocation(false);
   DetermineInstantSupport();
   SearchAndWaitForPreviewToShow();
-  TabContents* preview_contents = preview()->tab_contents();
+  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()->GetSelectedTabContents());
+  EXPECT_EQ(preview_contents, browser()->GetSelectedWebContents());
   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);
@@ skipping 37 matching lines @@
   EXPECT_TRUE(preview());
   EXPECT_TRUE(loader()->ready());
   EXPECT_TRUE(instant()->is_displayable());
   EXPECT_TRUE(instant()->IsCurrent());
 
   // Check that the suggested text has been set in the omnibox.
   EXPECT_EQ("defghi", GetSuggestion());
   EXPECT_EQ("defghi", UTF16ToUTF8(omnibox()->GetText()));
 
   // Press <Enter> in the omnibox, causing the preview to be committed.
-  TabContents* preview_tab = preview()->tab_contents();
+  WebContents* preview_tab = preview()->web_contents();
   ASSERT_TRUE(PressEnter());
 
   // The preview contents should now be the active tab contents.
   EXPECT_FALSE(preview());
   EXPECT_FALSE(instant()->is_displayable());
   EXPECT_FALSE(instant()->IsCurrent());
-  EXPECT_EQ(preview_tab, browser()->GetSelectedTabContents());
+  EXPECT_EQ(preview_tab, browser()->GetSelectedWebContents());
 }
 
 // Tests the HIDDEN experiment of the field trial.
 class InstantFieldTrialHiddenTest : public InstantTest {
  public:
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
     command_line->AppendSwitchASCII(switches::kInstantFieldTrial,
                                     switches::kInstantFieldTrialHidden);
   }
 };
@@ skipping 17 matching lines @@
   EXPECT_TRUE(preview());
   EXPECT_TRUE(loader()->ready());
   EXPECT_FALSE(instant()->is_displayable());
   EXPECT_FALSE(instant()->IsCurrent());
 
   // Check that the suggested text hasn't actually been set in the omnibox.
   EXPECT_EQ("defghi", GetSuggestion());
   EXPECT_EQ("def", UTF16ToUTF8(omnibox()->GetText()));
 
   // Press <Enter> in the omnibox, causing the preview to be committed.
-  TabContents* preview_tab = preview()->tab_contents();
+  WebContents* preview_tab = preview()->web_contents();
   ASSERT_TRUE(PressEnter());
 
   // The preview contents should now be the active tab contents.
   EXPECT_FALSE(preview());
   EXPECT_FALSE(instant()->is_displayable());
   EXPECT_FALSE(instant()->IsCurrent());
-  EXPECT_EQ(preview_tab, browser()->GetSelectedTabContents());
+  EXPECT_EQ(preview_tab, browser()->GetSelectedWebContents());
 }
 
 // Tests the SILENT experiment of the field trial.
 class InstantFieldTrialSilentTest : public InstantTest {
  public:
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
     command_line->AppendSwitchASCII(switches::kInstantFieldTrial,
                                     switches::kInstantFieldTrialSilent);
   }
 };
@@ skipping 17 matching lines @@
   EXPECT_TRUE(preview());
   EXPECT_FALSE(loader()->ready());
   EXPECT_FALSE(instant()->is_displayable());
   EXPECT_FALSE(instant()->IsCurrent());
 
   // There are no suggestions, as the loader hasn't seen the query yet.
   EXPECT_EQ("", GetSuggestion());
   EXPECT_EQ("def", UTF16ToUTF8(omnibox()->GetText()));
 
   // Press <Enter> in the omnibox, causing the preview to be committed.
-  TabContents* preview_tab = preview()->tab_contents();
+  WebContents* preview_tab = preview()->web_contents();
   ASSERT_TRUE(PressEnter());
 
   // The preview contents should now be the active tab contents.
   EXPECT_FALSE(preview());
   EXPECT_FALSE(instant()->is_displayable());
   EXPECT_FALSE(instant()->IsCurrent());
-  EXPECT_EQ(preview_tab, browser()->GetSelectedTabContents());
+  EXPECT_EQ(preview_tab, browser()->GetSelectedWebContents());
 }
 
 // Tests the SUGGEST experiment of the field trial.
 class InstantFieldTrialSuggestTest : public InstantTest {
  public:
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
     command_line->AppendSwitchASCII(switches::kInstantFieldTrial,
                                     switches::kInstantFieldTrialSuggest);
   }
 };
@@ skipping 17 matching lines @@
   EXPECT_TRUE(preview());
   EXPECT_TRUE(loader()->ready());
   EXPECT_FALSE(instant()->is_displayable());
   EXPECT_FALSE(instant()->IsCurrent());
 
   // Check that the suggested text has actually been set in the omnibox.
   EXPECT_EQ("defghi", GetSuggestion());
   EXPECT_EQ("defghi", UTF16ToUTF8(omnibox()->GetText()));
 
   // Press <Enter> in the omnibox, causing the preview to be committed.
-  TabContents* preview_tab = preview()->tab_contents();
+  WebContents* preview_tab = preview()->web_contents();
   ASSERT_TRUE(PressEnter());
 
   // The preview contents should now be the active tab contents.
   EXPECT_FALSE(preview());
   EXPECT_FALSE(instant()->is_displayable());
   EXPECT_FALSE(instant()->IsCurrent());
-  EXPECT_EQ(preview_tab, browser()->GetSelectedTabContents());
+  EXPECT_EQ(preview_tab, browser()->GetSelectedWebContents());
 }