Remove tabstrip wrappers in browser_tabstrip.

chrome/browser/safe_browsing/safe_browsing_blocking_page_test.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.
 //
 // This test creates a fake safebrowsing service, where we can inject
 // malware and phishing urls.  It then uses a real browser to go to
 // these urls, and sends "goback" or "proceed" commands and verifies
 // they work.
 
 #include "base/bind.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/safe_browsing/database_manager.h"
 #include "chrome/browser/safe_browsing/malware_details.h"
 #include "chrome/browser/safe_browsing/safe_browsing_blocking_page.h"
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
 #include "chrome/browser/safe_browsing/ui_manager.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
+#include "chrome/browser/ui/tabs/tab_strip_model.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/public/browser/interstitial_page.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
@@ skipping 320 matching lines @@
     GURL url = test_server()->GetURL(kMalwarePage);
     GURL iframe_url = test_server()->GetURL(kMalwareIframe);
     SetURLThreatType(iframe_url, SB_THREAT_TYPE_URL_MALWARE);
 
     ui_test_utils::NavigateToURL(browser(), url);
     EXPECT_TRUE(WaitForReady());
     return url;
   }
 
   void SendCommand(const std::string& command) {
-    WebContents* contents = chrome::GetActiveWebContents(browser());
+    WebContents* contents =
+        browser()->tab_strip_model()->GetActiveWebContents();
     // We use InterstitialPage::GetInterstitialPage(tab) instead of
     // tab->GetInterstitialPage() because the tab doesn't have a pointer
     // to its interstital page until it gets a command from the renderer
     // that it has indeed displayed it -- and this sometimes happens after
     // NavigateToURL returns.
     SafeBrowsingBlockingPage* interstitial_page =
         static_cast<SafeBrowsingBlockingPage*>(
             InterstitialPage::GetInterstitialPage(contents)->
                 GetDelegateForTesting());
     ASSERT_TRUE(interstitial_page);
     interstitial_page->CommandReceived(command);
   }
 
   void DontProceedThroughInterstitial() {
-    WebContents* contents = chrome::GetActiveWebContents(browser());
+    WebContents* contents =
+        browser()->tab_strip_model()->GetActiveWebContents();
     InterstitialPage* interstitial_page = InterstitialPage::GetInterstitialPage(
         contents);
     ASSERT_TRUE(interstitial_page);
     interstitial_page->DontProceed();
   }
 
   void ProceedThroughInterstitial() {
-    WebContents* contents = chrome::GetActiveWebContents(browser());
+    WebContents* contents =
+        browser()->tab_strip_model()->GetActiveWebContents();
     InterstitialPage* interstitial_page = InterstitialPage::GetInterstitialPage(
         contents);
     ASSERT_TRUE(interstitial_page);
     interstitial_page->Proceed();
   }
 
   void AssertNoInterstitial(bool wait_for_delete) {
-    WebContents* contents = chrome::GetActiveWebContents(browser());
+    WebContents* contents =
+        browser()->tab_strip_model()->GetActiveWebContents();
 
     if (contents->ShowingInterstitialPage() && wait_for_delete) {
       // We'll get notified when the interstitial is deleted.
       TestSafeBrowsingBlockingPage* page =
           static_cast<TestSafeBrowsingBlockingPage*>(
               contents->GetInterstitialPage()->GetDelegateForTesting());
       page->WaitForDelete();
     }
 
     // Can't use InterstitialPage::GetInterstitialPage() because that
     // gets updated after the TestSafeBrowsingBlockingPage destructor
     ASSERT_FALSE(contents->ShowingInterstitialPage());
   }
 
   bool YesInterstitial() {
-    WebContents* contents = chrome::GetActiveWebContents(browser());
+    WebContents* contents =
+        browser()->tab_strip_model()->GetActiveWebContents();
     InterstitialPage* interstitial_page = InterstitialPage::GetInterstitialPage(
         contents);
     return interstitial_page != NULL;
   }
 
   void WaitForInterstitial() {
-    WebContents* contents = chrome::GetActiveWebContents(browser());
+    WebContents* contents =
+        browser()->tab_strip_model()->GetActiveWebContents();
     content::WindowedNotificationObserver interstitial_observer(
         content::NOTIFICATION_INTERSTITIAL_ATTACHED,
         content::Source<WebContents>(contents));
     if (!InterstitialPage::GetInterstitialPage(contents))
       interstitial_observer.Wait();
   }
 
   void AssertReportSent() {
     // When a report is scheduled in the IO thread we should get notified.
     content::RunMessageLoop();
@@ skipping 18 matching lines @@
     ui_test_utils::NavigateToURL(browser(), load_url);
     // Trigger the safe browsing interstitial page via a redirect in
     // "openWin()".
     ui_test_utils::NavigateToURLWithDisposition(
         browser(),
         GURL("javascript:" + open_function + "()"),
         CURRENT_TAB,
         ui_test_utils::BROWSER_TEST_WAIT_FOR_TAB);
     WaitForInterstitial();
     // Cancel the redirect request while interstitial page is open.
-    chrome::ActivateTabAt(browser(), 0, true);
+    browser()->tab_strip_model()->ActivateTabAt(0, true);
     ui_test_utils::NavigateToURLWithDisposition(
         browser(),
         GURL("javascript:stopWin()"),
         CURRENT_TAB,
         ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
-    chrome::ActivateTabAt(browser(), 1, true);
+    browser()->tab_strip_model()->ActivateTabAt(1, true);
     // Simulate the user clicking "proceed", there should be no crash.  Since
     // clicking proceed may do nothing (see comment in MalwareRedirectCanceled
     // below, and crbug.com/76460), we use SendCommand to trigger the callback
     // directly rather than using ClickAndWaitForDetach since there might not
     // be a notification to wait for.
     SendCommand("\"proceed\"");
   }
 
   content::RenderViewHost* GetRenderViewHost() {
     InterstitialPage* interstitial = InterstitialPage::GetInterstitialPage(
-        chrome::GetActiveWebContents(browser()));
+        browser()->tab_strip_model()->GetActiveWebContents());
     if (!interstitial)
       return NULL;
     return interstitial->GetRenderViewHostForTesting();
   }
 
   bool WaitForReady() {
     content::RenderViewHost* rvh = GetRenderViewHost();
     if (!rvh)
       return false;
     // Wait until all <script> tags have executed, including jstemplate.
@@ skipping 42 matching lines @@
         ASCIIToUTF16("document.getElementById('" + node_id + "').click();\n"));
     return true;
   }
 
   bool ClickAndWaitForDetach(const std::string& node_id) {
     // We wait for interstitial_detached rather than nav_entry_committed, as
     // going back from a main-frame malware interstitial page will not cause a
     // nav entry committed event.
     content::WindowedNotificationObserver observer(
         content::NOTIFICATION_INTERSTITIAL_DETACHED,
-        content::Source<WebContents>(chrome::GetActiveWebContents(browser())));
+        content::Source<WebContents>(
+            browser()->tab_strip_model()->GetActiveWebContents()));
     if (!Click(node_id))
       return false;
     observer.Wait();
     return true;
   }
 
  protected:
   TestMalwareDetailsFactory details_factory_;
 
  private:
@@ skipping 33 matching lines @@
   EXPECT_EQ(HIDDEN, GetVisibility("proceed"));
   EXPECT_TRUE(Click("see-more-link"));
   EXPECT_EQ(VISIBLE, GetVisibility("show-diagnostic-link"));
   EXPECT_EQ(HIDDEN, GetVisibility("report-error-link"));
   EXPECT_EQ(VISIBLE, GetVisibility("proceed"));
 
   EXPECT_TRUE(ClickAndWaitForDetach("back"));
   AssertNoInterstitial(false);   // Assert the interstitial is gone
   EXPECT_EQ(
       GURL(chrome::kAboutBlankURL),  // Back to "about:blank"
-      chrome::GetActiveWebContents(browser())->GetURL());
+      browser()->tab_strip_model()->GetActiveWebContents()->GetURL());
 }
 
 IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageTest, MalwareProceed) {
   GURL url = SetupWarningAndNavigate(SB_THREAT_TYPE_URL_MALWARE);
 
   EXPECT_TRUE(ClickAndWaitForDetach("proceed"));
   AssertNoInterstitial(true);  // Assert the interstitial is gone.
-  EXPECT_EQ(url, chrome::GetActiveWebContents(browser())->GetURL());
+  EXPECT_EQ(url,
+            browser()->tab_strip_model()->GetActiveWebContents()->GetURL());
 }
 
 IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageTest,
                        MalwareLearnMore) {
   SetupWarningAndNavigate(SB_THREAT_TYPE_URL_MALWARE);
 
   EXPECT_TRUE(ClickAndWaitForDetach("learn-more-link"));
   AssertNoInterstitial(false);  // Assert the interstitial is gone
 
   // We are in the help page.
   EXPECT_EQ(
       "/goodtoknow/online-safety/malware/",
-       chrome::GetActiveWebContents(browser())->GetURL().path());
+       browser()->tab_strip_model()->GetActiveWebContents()->GetURL().path());
 }
 
 IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageTest,
                        MalwareIframeDontProceed) {
   SetupMalwareIframeWarningAndNavigate();
 
   EXPECT_EQ(HIDDEN, GetVisibility("malware-icon"));
   EXPECT_EQ(VISIBLE, GetVisibility("subresource-icon"));
   EXPECT_EQ(HIDDEN, GetVisibility("phishing-icon"));
   EXPECT_EQ(VISIBLE, GetVisibility("check-report"));
   EXPECT_EQ(HIDDEN, GetVisibility("show-diagnostic-link"));
   EXPECT_EQ(HIDDEN, GetVisibility("report-error-link"));
   EXPECT_EQ(HIDDEN, GetVisibility("proceed"));
   EXPECT_TRUE(Click("see-more-link"));
   EXPECT_EQ(VISIBLE, GetVisibility("show-diagnostic-link"));
   EXPECT_EQ(HIDDEN, GetVisibility("report-error-link"));
   EXPECT_EQ(VISIBLE, GetVisibility("proceed"));
 
   EXPECT_TRUE(ClickAndWaitForDetach("back"));
   AssertNoInterstitial(false);  // Assert the interstitial is gone
 
   EXPECT_EQ(
       GURL(chrome::kAboutBlankURL),  // Back to "about:blank"
-      chrome::GetActiveWebContents(browser())->GetURL());
+      browser()->tab_strip_model()->GetActiveWebContents()->GetURL());
 }
 
 // Crashy, http://crbug.com/68834.
 IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageTest,
                        DISABLED_MalwareIframeProceed) {
   GURL url = SetupMalwareIframeWarningAndNavigate();
 
   EXPECT_TRUE(ClickAndWaitForDetach("proceed"));
   AssertNoInterstitial(true);  // Assert the interstitial is gone
 
-  EXPECT_EQ(url, chrome::GetActiveWebContents(browser())->GetURL());
+  EXPECT_EQ(url,
+            browser()->tab_strip_model()->GetActiveWebContents()->GetURL());
 }
 
 IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageTest,
                        MalwareIframeReportDetails) {
   GURL url = SetupMalwareIframeWarningAndNavigate();
 
   // If the DOM details from renderer did not already return, wait for them.
   details_factory_.get_details()->WaitForDOM();
 
   EXPECT_TRUE(Click("check-report"));
 
   EXPECT_TRUE(ClickAndWaitForDetach("proceed"));
   AssertNoInterstitial(true);  // Assert the interstitial is gone
 
   EXPECT_TRUE(browser()->profile()->GetPrefs()->GetBoolean(
       prefs::kSafeBrowsingReportingEnabled));
 
-  EXPECT_EQ(url, chrome::GetActiveWebContents(browser())->GetURL());
+  EXPECT_EQ(url,
+            browser()->tab_strip_model()->GetActiveWebContents()->GetURL());
   AssertReportSent();
 }
 
 // Verifies that the "proceed anyway" link isn't available when it is disabled
 // by the corresponding policy. Also verifies that sending the "proceed"
 // command anyway doesn't advance to the malware site.
 IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageTest, ProceedDisabled) {
   // Simulate a policy disabling the "proceed anyway" link.
   browser()->profile()->GetPrefs()->SetBoolean(
       prefs::kSafeBrowsingProceedAnywayDisabled, true);
 
   SetupWarningAndNavigate(SB_THREAT_TYPE_URL_MALWARE);
 
   EXPECT_EQ(VISIBLE, GetVisibility("check-report"));
   EXPECT_EQ(HIDDEN, GetVisibility("show-diagnostic-link"));
   EXPECT_EQ(HIDDEN, GetVisibility("proceed"));
   EXPECT_EQ(HIDDEN, GetVisibility("proceed-span"));
   EXPECT_TRUE(Click("see-more-link"));
   EXPECT_EQ(VISIBLE, GetVisibility("show-diagnostic-link"));
   EXPECT_EQ(HIDDEN, GetVisibility("proceed"));
   EXPECT_EQ(HIDDEN, GetVisibility("proceed-span"));
 
   // The "proceed" command should go back instead, if proceeding is disabled.
   EXPECT_TRUE(ClickAndWaitForDetach("proceed"));
   AssertNoInterstitial(true);
   EXPECT_EQ(
       GURL(chrome::kAboutBlankURL),  // Back to "about:blank"
-      chrome::GetActiveWebContents(browser())->GetURL());
+      browser()->tab_strip_model()->GetActiveWebContents()->GetURL());
 }
 
 // Verifies that the reporting checkbox is hidden on non-HTTP pages.
 // TODO(mattm): Should also verify that no report is sent, but there isn't a
 // good way to do that in the current design.
 IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageTest, ReportingDisabled) {
   browser()->profile()->GetPrefs()->SetBoolean(
       prefs::kSafeBrowsingReportingEnabled, true);
 
   net::TestServer https_server(net::TestServer::TYPE_HTTPS,
                                net::TestServer::kLocalhost,
                                FilePath(FILE_PATH_LITERAL("chrome/test/data")));
   ASSERT_TRUE(https_server.Start());
   GURL url = https_server.GetURL(kEmptyPage);
   SetURLThreatType(url, SB_THREAT_TYPE_URL_MALWARE);
   ui_test_utils::NavigateToURL(browser(), url);
   ASSERT_TRUE(WaitForReady());
 
   EXPECT_EQ(HIDDEN, GetVisibility("check-report"));
   EXPECT_EQ(HIDDEN, GetVisibility("show-diagnostic-link"));
   EXPECT_EQ(HIDDEN, GetVisibility("proceed"));
   EXPECT_TRUE(Click("see-more-link"));
   EXPECT_EQ(VISIBLE, GetVisibility("show-diagnostic-link"));
   EXPECT_EQ(VISIBLE, GetVisibility("proceed"));
 
   EXPECT_TRUE(ClickAndWaitForDetach("back"));
   AssertNoInterstitial(false);   // Assert the interstitial is gone
   EXPECT_EQ(
       GURL(chrome::kAboutBlankURL),  // Back to "about:blank"
-      chrome::GetActiveWebContents(browser())->GetURL());
+      browser()->tab_strip_model()->GetActiveWebContents()->GetURL());
 }
 
 IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageTest, PhishingDontProceed) {
   SetupWarningAndNavigate(SB_THREAT_TYPE_URL_PHISHING);
 
   EXPECT_EQ(HIDDEN, GetVisibility("malware-icon"));
   EXPECT_EQ(HIDDEN, GetVisibility("subresource-icon"));
   EXPECT_EQ(VISIBLE, GetVisibility("phishing-icon"));
   EXPECT_EQ(HIDDEN, GetVisibility("check-report"));
   EXPECT_EQ(HIDDEN, GetVisibility("show-diagnostic-link"));
   EXPECT_EQ(HIDDEN, GetVisibility("report-error-link"));
   EXPECT_EQ(HIDDEN, GetVisibility("proceed"));
   EXPECT_TRUE(Click("see-more-link"));
   EXPECT_EQ(HIDDEN, GetVisibility("show-diagnostic-link"));
   EXPECT_EQ(VISIBLE, GetVisibility("report-error-link"));
   EXPECT_EQ(VISIBLE, GetVisibility("proceed"));
 
   EXPECT_TRUE(ClickAndWaitForDetach("back"));
   AssertNoInterstitial(false);  // Assert the interstitial is gone
   EXPECT_EQ(
       GURL(chrome::kAboutBlankURL),  // We are back to "about:blank".
-      chrome::GetActiveWebContents(browser())->GetURL());
+      browser()->tab_strip_model()->GetActiveWebContents()->GetURL());
 }
 
 IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageTest, PhishingProceed) {
   GURL url = SetupWarningAndNavigate(SB_THREAT_TYPE_URL_PHISHING);
 
   EXPECT_TRUE(ClickAndWaitForDetach("proceed"));
   AssertNoInterstitial(true);  // Assert the interstitial is gone
-  EXPECT_EQ(url, chrome::GetActiveWebContents(browser())->GetURL());
+  EXPECT_EQ(url,
+            browser()->tab_strip_model()->GetActiveWebContents()->GetURL());
 }
 
 IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageTest, PhishingReportError) {
   SetupWarningAndNavigate(SB_THREAT_TYPE_URL_PHISHING);
 
   EXPECT_TRUE(ClickAndWaitForDetach("report-error-link"));
   AssertNoInterstitial(false);  // Assert the interstitial is gone
 
   // We are in the error reporting page.
   EXPECT_EQ(
       "/safebrowsing/report_error/",
-      chrome::GetActiveWebContents(browser())->GetURL().path());
+      browser()->tab_strip_model()->GetActiveWebContents()->GetURL().path());
 }
 
 IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageTest, PhishingLearnMore) {
   SetupWarningAndNavigate(SB_THREAT_TYPE_URL_PHISHING);
 
   EXPECT_TRUE(ClickAndWaitForDetach("learn-more-link"));
   AssertNoInterstitial(false);  // Assert the interstitial is gone
 
   // We are in the help page.
   EXPECT_EQ(
       "/goodtoknow/online-safety/phishing/",
-       chrome::GetActiveWebContents(browser())->GetURL().path());
+       browser()->tab_strip_model()->GetActiveWebContents()->GetURL().path());
 }