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

chrome/browser/chromeos/tab_closeable_state_watcher_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 "chrome/browser/chromeos/tab_closeable_state_watcher.h"
 
 #include "base/file_path.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/app_modal_dialogs/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_list.h"
 #include "chrome/browser/ui/browser_window.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/tab_contents/tab_contents.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
+#include "content/public/browser/web_contents.h"
 #include "googleurl/src/gurl.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::WebContents;
+
 namespace chromeos {
 
 class TabCloseableStateWatcherTest : public InProcessBrowserTest {
  public:
   TabCloseableStateWatcherTest() {
     // This test is testing TabCloseStateWatcher, so enable it.
     EnableTabCloseableStateWatcher();
     blank_url_ = GURL(chrome::kAboutBlankURL);
     ntp_url_ = GURL(chrome::kChromeUINewTabURL);
     other_url_ = ui_test_utils::GetTestUrl(
@@ skipping 146 matching lines @@
   EXPECT_FALSE(CanCloseTab(browser()));
 }
 
 // Tests closing a closeable tab - tab should be closed, browser should remain
 // opened with a NewTabPage.
 IN_PROC_BROWSER_TEST_F(TabCloseableStateWatcherTest, CloseCloseableTab) {
   EXPECT_EQ(1, browser()->tab_count());
   EXPECT_TRUE(CanCloseTab(browser()));
   browser()->CloseTab();
   EXPECT_EQ(1, browser()->tab_count());
-  EXPECT_EQ(ntp_url_, browser()->GetSelectedTabContents()->GetURL());
+  EXPECT_EQ(ntp_url_, browser()->GetSelectedWebContents()->GetURL());
 }
 
 // Tests closing a closeable browser - all tabs in browser should be closed,
 // browser should remain opened with a NewTabPage.
 IN_PROC_BROWSER_TEST_F(TabCloseableStateWatcherTest, CloseCloseableBrowser) {
   EXPECT_EQ(1, browser()->tab_count());
   EXPECT_TRUE(CanCloseTab(browser()));
   browser()->CloseWindow();
   EXPECT_EQ(1u, BrowserList::size());
   EXPECT_EQ(browser(), *(BrowserList::begin()));
   EXPECT_EQ(1, browser()->tab_count());
-  EXPECT_EQ(ntp_url_, browser()->GetSelectedTabContents()->GetURL());
+  EXPECT_EQ(ntp_url_, browser()->GetSelectedWebContents()->GetURL());
 }
 
 // Tests closing a non-closeable tab and hence non-closeable browser - tab and
 // browser should remain opened.
 IN_PROC_BROWSER_TEST_F(TabCloseableStateWatcherTest,
                        CloseNonCloseableTabAndBrowser) {
   // Close non-closeable tab.
   EXPECT_EQ(1, browser()->tab_count());
   NavigateToURL(ntp_url_);
   EXPECT_FALSE(CanCloseTab(browser()));
-  TabContents* tab_contents = browser()->GetSelectedTabContents();
+  WebContents* web_contents = browser()->GetSelectedWebContents();
   browser()->CloseTab();
   EXPECT_EQ(1, browser()->tab_count());
-  EXPECT_EQ(tab_contents, browser()->GetSelectedTabContents());
+  EXPECT_EQ(web_contents, browser()->GetSelectedWebContents());
 
   // Close browser with non-closeable tab.
   browser()->CloseWindow();
   EXPECT_EQ(1u, BrowserList::size());
   EXPECT_EQ(browser(), *(BrowserList::begin()));
   EXPECT_EQ(1, browser()->tab_count());
-  EXPECT_EQ(tab_contents, browser()->GetSelectedTabContents());
+  EXPECT_EQ(web_contents, browser()->GetSelectedWebContents());
 }
 
 // Tests an incognito browsr with a normal browser.
 // - when incognito browser is opened, all browsers (including previously
 //   non-clsoeable normal browsers) become closeable.
 // - when incognito browser is closed, normal browsers return to adhering to the
 //   original closebable rules.
 IN_PROC_BROWSER_TEST_F(TabCloseableStateWatcherTest, SecondIncognitoBrowser) {
   NavigateToURL(ntp_url_);
   EXPECT_FALSE(CanCloseTab(browser()));
@@ skipping 29 matching lines @@
   EXPECT_EQ(1u, BrowserList::size());
   EXPECT_EQ(incognito_browser, *(BrowserList::begin()));
   EXPECT_TRUE(CanCloseTab(incognito_browser));
 
   // Close incognito browser.
   incognito_browser->CloseWindow();
   Browser* new_browser = ui_test_utils::WaitForNewBrowser();
   EXPECT_EQ(1u, BrowserList::size());
   EXPECT_FALSE(new_browser->profile()->IsOffTheRecord());
   EXPECT_EQ(1, new_browser->tab_count());
-  EXPECT_EQ(ntp_url_, new_browser->GetSelectedTabContents()->GetURL());
+  EXPECT_EQ(ntp_url_, new_browser->GetSelectedWebContents()->GetURL());
 }
 
 // Tests closing of browser with BeforeUnload handler where user clicks cancel
 // (i.e. stay on the page and cancel closing) - browser and its tabs should stay
 // the same.
 // Sporadically crashing test. See http://crbug.com/79333
 IN_PROC_BROWSER_TEST_F(TabCloseableStateWatcherTest,
                        DISABLED_CloseBrowserWithBeforeUnloadHandlerCancel) {
   // Navigate to URL with BeforeUnload handler.
   NavigateToBeforeUnloadURL();
   EXPECT_TRUE(CanCloseTab(browser()));
 
   // Close browser, click Cancel in BeforeUnload confirm dialog.
-  TabContents* tab_contents = browser()->GetSelectedTabContents();
+  WebContents* web_contents = browser()->GetSelectedWebContents();
   browser()->CloseWindow();
   AppModalDialog* confirm = ui_test_utils::WaitForAppModalDialog();
   confirm->native_dialog()->CancelAppModalDialog();
   ui_test_utils::RunAllPendingInMessageLoop();
   EXPECT_EQ(1u, BrowserList::size());
   EXPECT_EQ(browser(), *(BrowserList::begin()));
   EXPECT_EQ(1, browser()->tab_count());
-  EXPECT_EQ(tab_contents, browser()->GetSelectedTabContents());
+  EXPECT_EQ(web_contents, browser()->GetSelectedWebContents());
 
   // Close the browser.
   browser()->CloseWindow();
   confirm = ui_test_utils::WaitForAppModalDialog();
   confirm->native_dialog()->AcceptAppModalDialog();
   ui_test_utils::RunAllPendingInMessageLoop();
 }
 
 // Tests closing of browser with BeforeUnload handler where user clicks OK (i.e.
 // leave the page and proceed with closing), all tabs in browser should close,
 // browser remains opened with a NewTabPage.
 IN_PROC_BROWSER_TEST_F(TabCloseableStateWatcherTest,
                        CloseBrowserWithBeforeUnloadHandlerOK) {
   // Navigate to URL with BeforeUnload handler.
   NavigateToBeforeUnloadURL();
   EXPECT_TRUE(CanCloseTab(browser()));
 
   // Close browser, click OK in BeforeUnload confirm dialog.
   browser()->CloseWindow();
   AppModalDialog* confirm = ui_test_utils::WaitForAppModalDialog();
   confirm->native_dialog()->AcceptAppModalDialog();
   NewTabObserver new_tab_observer(browser());
   EXPECT_EQ(1u, BrowserList::size());
   EXPECT_EQ(browser(), *(BrowserList::begin()));
   EXPECT_EQ(1, browser()->tab_count());
-  EXPECT_EQ(ntp_url_, browser()->GetSelectedTabContents()->GetURL());
+  EXPECT_EQ(ntp_url_, browser()->GetSelectedWebContents()->GetURL());
 }
 
 }  // namespace chromeos