Remove tabstrip wrappers in browser_tabstrip.

chrome/browser/notifications/notification_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 <deque>
 #include <string>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/compiler_specific.h"
@@ skipping 10 matching lines @@
 #include "chrome/browser/notifications/balloon_host.h"
 #include "chrome/browser/notifications/desktop_notification_service.h"
 #include "chrome/browser/notifications/desktop_notification_service_factory.h"
 #include "chrome/browser/notifications/notification.h"
 #include "chrome/browser/notifications/notification_ui_manager.h"
 #include "chrome/browser/profiles/profile.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/tab_contents/tab_contents.h"
+#include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/content_settings.h"
 #include "chrome/common/content_settings_pattern.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
@@ skipping 171 matching lines @@
 
 void NotificationsTest::CloseBrowserWindow(Browser* browser) {
   content::WindowedNotificationObserver observer(
       chrome::NOTIFICATION_BROWSER_CLOSED,
       content::Source<Browser>(browser));
   browser->window()->Close();
   observer.Wait();
 }
 
 void NotificationsTest::CrashTab(Browser* browser, int index) {
-  content::CrashTab(chrome::GetWebContentsAt(browser, index));
+  content::CrashTab(browser->tab_strip_model()->GetWebContentsAt(index));
 }
 
 void NotificationsTest::CrashNotification(Balloon* balloon) {
   content::CrashTab(balloon->balloon_view()->GetHost()->web_contents());
 }
 
 void NotificationsTest::SetDefaultPermissionSetting(ContentSetting setting) {
   DesktopNotificationService* service = GetDesktopNotificationService();
   service->SetDefaultContentSetting(setting);
 }
 
 void NotificationsTest::DenyOrigin(const GURL& origin) {
   DropOriginPreference(origin);
   GetDesktopNotificationService()->DenyPermission(origin);
 }
 
 void NotificationsTest::AllowOrigin(const GURL& origin) {
   DropOriginPreference(origin);
   GetDesktopNotificationService()->GrantPermission(origin);
 }
 
 void NotificationsTest::AllowAllOrigins() {
   GetDesktopNotificationService()->ResetAllOrigins();
   GetDesktopNotificationService()->SetDefaultContentSetting(
       CONTENT_SETTING_ALLOW);
 }
 
 void NotificationsTest::VerifyInfobar(const Browser* browser, int index) {
   InfoBarTabHelper* infobar_helper = InfoBarTabHelper::FromWebContents(
-      chrome::GetWebContentsAt(browser, index));
+      browser->tab_strip_model()->GetWebContentsAt(index));
 
   ASSERT_EQ(1U, infobar_helper->GetInfoBarCount());
   InfoBarDelegate* infobar = infobar_helper->GetInfoBarDelegateAt(0);
   ConfirmInfoBarDelegate* confirm_infobar = infobar->AsConfirmInfoBarDelegate();
   ASSERT_TRUE(confirm_infobar);
   int buttons = confirm_infobar->GetButtons();
   EXPECT_TRUE(buttons & ConfirmInfoBarDelegate::BUTTON_OK);
   EXPECT_TRUE(buttons & ConfirmInfoBarDelegate::BUTTON_CANCEL);
 }
 
 std::string NotificationsTest::CreateNotification(
     Browser* browser,
     bool wait_for_new_balloon,
     const char* icon,
     const char* title,
     const char* body,
     const char* replace_id) {
   std::string script = base::StringPrintf(
       "createNotification('%s', '%s', '%s', '%s');",
       icon, title, body, replace_id);
 
   NotificationBalloonChangeObserver observer;
   std::string result;
   bool success = content::ExecuteJavaScriptAndExtractString(
-      chrome::GetActiveWebContents(browser)->GetRenderViewHost(),
+      browser->tab_strip_model()->GetActiveWebContents()->GetRenderViewHost(),
       L"",
       UTF8ToWide(script),
       &result);
   if (success && result != "-1" && wait_for_new_balloon)
     success = observer.Wait();
   EXPECT_TRUE(success);
 
   return result;
 }
 
 std::string NotificationsTest::CreateSimpleNotification(
     Browser* browser,
     bool wait_for_new_balloon) {
   return CreateNotification(
       browser, wait_for_new_balloon,
       "no_such_file.png", "My Title", "My Body", "");
 }
 
 bool NotificationsTest::RequestPermissionAndWait(Browser* browser) {
   InfoBarTabHelper* infobar_helper = InfoBarTabHelper::FromWebContents(
-      chrome::GetActiveWebContents(browser));
+      browser->tab_strip_model()->GetActiveWebContents());
   content::WindowedNotificationObserver observer(
       chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_ADDED,
       content::Source<InfoBarTabHelper>(infobar_helper));
   std::string result;
   bool success = content::ExecuteJavaScriptAndExtractString(
-      chrome::GetActiveWebContents(browser)->GetRenderViewHost(),
+      browser->tab_strip_model()->GetActiveWebContents()->GetRenderViewHost(),
       L"",
       L"requestPermission();",
       &result);
   if (!success || result != "1")
     return false;
   observer.Wait();
   return true;
 }
 
 bool NotificationsTest::CancelNotification(
     const char* notification_id,
     Browser* browser) {
   std::string script = base::StringPrintf(
       "cancelNotification('%s');",
       notification_id);
 
   NotificationBalloonChangeObserver observer;
   std::string result;
   bool success = content::ExecuteJavaScriptAndExtractString(
-      chrome::GetActiveWebContents(browser)->GetRenderViewHost(),
+      browser->tab_strip_model()->GetActiveWebContents()->GetRenderViewHost(),
       L"",
       UTF8ToWide(script),
       &result);
   if (!success || result != "1")
     return false;
   return observer.Wait();
 }
 
 bool NotificationsTest::PerformActionOnInfobar(
     Browser* browser,
     InfobarAction action,
     int infobar_index,
     int tab_index) {
   InfoBarTabHelper* infobar_helper = InfoBarTabHelper::FromWebContents(
-      chrome::GetWebContentsAt(browser, tab_index));
+      browser->tab_strip_model()->GetWebContentsAt(tab_index));
 
   InfoBarDelegate* infobar = infobar_helper->GetInfoBarDelegateAt(
       infobar_index);
   switch (action) {
     case DISMISS: {
       infobar->InfoBarDismissed();
       infobar_helper->RemoveInfoBar(infobar);
       return true;
     }
     case ALLOW: {
@@ skipping 56 matching lines @@
 IN_PROC_BROWSER_TEST_F(NotificationsTest, TestUserGestureInfobar) {
   ui_test_utils::NavigateToURL(
       browser(),
       test_server()->GetURL(
           "files/notifications/notifications_request_function.html"));
 
   // Request permission by calling request() while eval'ing an inline script;
   // That's considered a user gesture to webkit, and should produce an infobar.
   bool result;
   ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
-      chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
+      browser()->tab_strip_model()->GetActiveWebContents()->GetRenderViewHost(),
       L"",
       L"window.domAutomationController.send(request());",
       &result));
   EXPECT_TRUE(result);
 
   EXPECT_EQ(1U, InfoBarTabHelper::FromWebContents(
-      chrome::GetWebContentsAt(browser(), 0))->GetInfoBarCount());
+      browser()->tab_strip_model()->GetWebContentsAt(0))->GetInfoBarCount());
 }
 
 // If this flakes, use http://crbug.com/62311.
 IN_PROC_BROWSER_TEST_F(NotificationsTest, TestNoUserGestureInfobar) {
   // Load a page which just does a request; no user gesture should result
   // in no infobar.
   ui_test_utils::NavigateToURL(
       browser(),
       test_server()->GetURL(
           "files/notifications/notifications_request_inline.html"));
 
   EXPECT_EQ(0U, InfoBarTabHelper::FromWebContents(
-      chrome::GetWebContentsAt(browser(), 0))->GetInfoBarCount());
+      browser()->tab_strip_model()->GetWebContentsAt(0))->GetInfoBarCount());
 }
 
 // Disable new testcases on Chrome OS due to failure on creating notification.
 #if !defined(OS_CHROMEOS)
 
 IN_PROC_BROWSER_TEST_F(NotificationsTest, TestCreateSimpleNotification) {
   // Creates a simple notification.
   AllowAllOrigins();
   ui_test_utils::NavigateToURL(browser(), test_page_url_);
 
@@ skipping 105 matching lines @@
 IN_PROC_BROWSER_TEST_F(NotificationsTest, TestAllowNotificationsFromAllSites) {
   // Verify that all domains can be allowed to show notifications.
   SetDefaultPermissionSetting(CONTENT_SETTING_ALLOW);
   ui_test_utils::NavigateToURL(browser(), test_page_url_);
 
   std::string result = CreateSimpleNotification(browser(), true);
   EXPECT_NE("-1", result);
 
   ASSERT_EQ(1, GetNotificationCount());
   EXPECT_EQ(0U, InfoBarTabHelper::FromWebContents(
-      chrome::GetWebContentsAt(browser(), 0))->GetInfoBarCount());
+      browser()->tab_strip_model()->GetWebContentsAt(0))->GetInfoBarCount());
 }
 
 IN_PROC_BROWSER_TEST_F(NotificationsTest, TestDenyNotificationsFromAllSites) {
   // Verify that no domain can show notifications.
   SetDefaultPermissionSetting(CONTENT_SETTING_BLOCK);
   ui_test_utils::NavigateToURL(browser(), test_page_url_);
 
   std::string result = CreateSimpleNotification(browser(), false);
   EXPECT_EQ("-1", result);
 
@@ skipping 38 matching lines @@
   EXPECT_EQ("-1", result);
 
   ASSERT_EQ(0, GetNotificationCount());
 
   AllowOrigin(test_page_url_.GetOrigin());
   result = CreateSimpleNotification(browser(), true);
   EXPECT_NE("-1", result);
 
   ASSERT_EQ(1, GetNotificationCount());
   EXPECT_EQ(0U, InfoBarTabHelper::FromWebContents(
-      chrome::GetWebContentsAt(browser(), 0))->GetInfoBarCount());
+      browser()->tab_strip_model()->GetWebContentsAt(0))->GetInfoBarCount());
 }
 
 IN_PROC_BROWSER_TEST_F(NotificationsTest, TestCreateDenyCloseNotifications) {
   // Verify able to create, deny, and close the notification.
   AllowAllOrigins();
   ui_test_utils::NavigateToURL(browser(), test_page_url_);
   CreateSimpleNotification(browser(), true);
   ASSERT_EQ(1, GetNotificationCount());
 
   DenyOrigin(test_page_url_.GetOrigin());
@@ skipping 43 matching lines @@
   ASSERT_TRUE(RequestPermissionAndWait(browser()));
 }
 
 IN_PROC_BROWSER_TEST_F(NotificationsTest, TestCrashTabWithPermissionInfobar) {
   // Test crashing the tab with permission infobar doesn't crash Chrome.
   ui_test_utils::NavigateToURLWithDisposition(
       browser(),
       empty_page_url_,
       NEW_BACKGROUND_TAB,
       ui_test_utils::BROWSER_TEST_WAIT_FOR_TAB);
-  chrome::ActivateTabAt(browser(), 0, true);
+  browser()->tab_strip_model()->ActivateTabAt(0, true);
   ui_test_utils::NavigateToURL(browser(), test_page_url_);
   ASSERT_TRUE(RequestPermissionAndWait(browser()));
   CrashTab(browser(), 0);
 }
 
 IN_PROC_BROWSER_TEST_F(NotificationsTest, TestKillNotificationProcess) {
   // Test killing a notification doesn't crash Chrome.
   AllowAllOrigins();
   ui_test_utils::NavigateToURL(browser(), test_page_url_);
   CreateSimpleNotification(browser(), true);
   ASSERT_EQ(1, GetNotificationCount());
 
   const std::deque<Balloon*>& balloons = GetActiveBalloons();
   ASSERT_EQ(1U, balloons.size());
   CrashNotification(balloons[0]);
   ASSERT_EQ(0, GetNotificationCount());
 }
 
 IN_PROC_BROWSER_TEST_F(NotificationsTest, TestIncognitoNotification) {
   // Test notifications in incognito window.
   Browser* browser = CreateIncognitoBrowser();
   ui_test_utils::NavigateToURL(browser, test_page_url_);
-  chrome::ActivateTabAt(browser, 0, true);
+  browser->tab_strip_model()->ActivateTabAt(0, true);
   ASSERT_TRUE(RequestPermissionAndWait(browser));
   PerformActionOnInfobar(browser, ALLOW, 0, 0);
   CreateSimpleNotification(browser, true);
   ASSERT_EQ(1, GetNotificationCount());
 }
 
 IN_PROC_BROWSER_TEST_F(NotificationsTest, TestCloseTabWithPermissionInfobar) {
   // Test that user can close tab when infobar present.
   ui_test_utils::NavigateToURLWithDisposition(
       browser(),
       GURL("about:blank"),
       NEW_BACKGROUND_TAB,
       ui_test_utils::BROWSER_TEST_WAIT_FOR_TAB);
-  chrome::ActivateTabAt(browser(), 0, true);
+  browser()->tab_strip_model()->ActivateTabAt(0, true);
   ui_test_utils::NavigateToURL(browser(), test_page_url_);
   ASSERT_TRUE(RequestPermissionAndWait(browser()));
   content::WindowedNotificationObserver observer(
       content::NOTIFICATION_WEB_CONTENTS_DESTROYED,
       content::NotificationService::AllSources());
-  chrome::CloseWebContents(browser(), chrome::GetWebContentsAt(browser(), 0));
+  chrome::CloseWebContents(browser(),
+                           browser()->tab_strip_model()->GetWebContentsAt(0));
   observer.Wait();
 }
 
 IN_PROC_BROWSER_TEST_F(
     NotificationsTest,
     TestNavigateAwayWithPermissionInfobar) {
   // Test navigating away when an infobar is present,
   // then trying to create a notification from the same page.
   ui_test_utils::NavigateToURLWithDisposition(
       browser(),
       GURL("about:blank"),
       NEW_BACKGROUND_TAB,
       ui_test_utils::BROWSER_TEST_WAIT_FOR_TAB);
-  chrome::ActivateTabAt(browser(), 0, true);
+  browser()->tab_strip_model()->ActivateTabAt(0, true);
   ui_test_utils::NavigateToURL(browser(), test_page_url_);
   ASSERT_TRUE(RequestPermissionAndWait(browser()));
   ui_test_utils::NavigateToURL(browser(), test_page_url_);
   ASSERT_TRUE(RequestPermissionAndWait(browser()));
   PerformActionOnInfobar(browser(), ALLOW, 0, 0);
   CreateSimpleNotification(browser(), true);
   ASSERT_EQ(1, GetNotificationCount());
 }
 
 IN_PROC_BROWSER_TEST_F(NotificationsTest, TestCrashRendererNotificationRemain) {
   // Test crashing renderer does not close or crash notification.
   AllowAllOrigins();
   ui_test_utils::NavigateToURLWithDisposition(
       browser(),
       GURL("about:blank"),
       NEW_BACKGROUND_TAB,
       ui_test_utils::BROWSER_TEST_WAIT_FOR_TAB);
-  chrome::ActivateTabAt(browser(), 0, true);
+  browser()->tab_strip_model()->ActivateTabAt(0, true);
   ui_test_utils::NavigateToURL(browser(), test_page_url_);
   CreateSimpleNotification(browser(), true);
   ASSERT_EQ(1, GetNotificationCount());
   CrashTab(browser(), 0);
   ASSERT_EQ(1, GetNotificationCount());
 }
 
 IN_PROC_BROWSER_TEST_F(NotificationsTest, TestNotificationReplacement) {
   // Test that we can replace a notification using the replaceId.
   AllowAllOrigins();
@@ skipping 13 matching lines @@
   const std::deque<Balloon*>& balloons = GetActiveBalloons();
   EXPECT_EQ(1U, balloons.size());
   const Notification& notification = balloons[0]->notification();
   GURL EXPECTED_ICON_URL = test_server()->GetURL(kExpectedIconUrl);
   EXPECT_EQ(EXPECTED_ICON_URL, notification.icon_url());
   EXPECT_EQ(ASCIIToUTF16("Title2"), notification.title());
   EXPECT_EQ(ASCIIToUTF16("Body2"), notification.body());
 }
 
 #endif  // !defined(OS_CHROMEOS)