| Index: chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.cc
|
| diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.cc
|
| index 3043a9524c59a076877305b0c7a32ec577029337..4e32b241f44ee01f81d076b67d3b7727970a7c95 100644
|
| --- a/chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.cc
|
| +++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.cc
|
| @@ -124,7 +124,7 @@ class SafeBrowsingBlockingPageTest : public ChromeRenderViewHostTestHarness {
|
| void Navigate(const char* url, int page_id) {
|
| WebContentsTester::For(web_contents())->TestDidNavigate(
|
| web_contents()->GetMainFrame(), page_id, GURL(url),
|
| - content::PAGE_TRANSITION_TYPED);
|
| + ui::PAGE_TRANSITION_TYPED);
|
| }
|
|
|
| void GoBack(bool is_cross_site) {
|
| @@ -141,7 +141,7 @@ class SafeBrowsingBlockingPageTest : public ChromeRenderViewHostTestHarness {
|
| rfh,
|
| entry->GetPageID(),
|
| GURL(entry->GetURL()),
|
| - content::PAGE_TRANSITION_TYPED);
|
| + ui::PAGE_TRANSITION_TYPED);
|
| }
|
|
|
| void ShowInterstitial(bool is_subresource, const char* url) {
|
| @@ -220,7 +220,7 @@ TEST_F(SafeBrowsingBlockingPageTest, MalwarePageDontProceed) {
|
|
|
| // Start a load.
|
| controller().LoadURL(GURL(kBadURL), content::Referrer(),
|
| - content::PAGE_TRANSITION_TYPED, std::string());
|
| + ui::PAGE_TRANSITION_TYPED, std::string());
|
|
|
|
|
| // Simulate the load causing a safe browsing interstitial to be shown.
|
| @@ -256,7 +256,7 @@ TEST_F(SafeBrowsingBlockingPageTest, MalwarePageProceed) {
|
|
|
| // Start a load.
|
| controller().LoadURL(GURL(kBadURL), content::Referrer(),
|
| - content::PAGE_TRANSITION_TYPED, std::string());
|
| + ui::PAGE_TRANSITION_TYPED, std::string());
|
|
|
| // Simulate the load causing a safe browsing interstitial to be shown.
|
| ShowInterstitial(false, kBadURL);
|
| @@ -520,7 +520,7 @@ TEST_F(SafeBrowsingBlockingPageTest, NavigatingBackAndForth) {
|
|
|
| // Now navigate to a bad page triggerring an interstitial.
|
| controller().LoadURL(GURL(kBadURL), content::Referrer(),
|
| - content::PAGE_TRANSITION_TYPED, std::string());
|
| + ui::PAGE_TRANSITION_TYPED, std::string());
|
| ShowInterstitial(false, kBadURL);
|
| SafeBrowsingBlockingPage* sb_interstitial =
|
| GetSafeBrowsingBlockingPage();
|
| @@ -567,7 +567,7 @@ TEST_F(SafeBrowsingBlockingPageTest, ProceedThenDontProceed) {
|
|
|
| // Start a load.
|
| controller().LoadURL(GURL(kBadURL), content::Referrer(),
|
| - content::PAGE_TRANSITION_TYPED, std::string());
|
| + ui::PAGE_TRANSITION_TYPED, std::string());
|
|
|
| // Simulate the load causing a safe browsing interstitial to be shown.
|
| ShowInterstitial(false, kBadURL);
|
| @@ -604,7 +604,7 @@ TEST_F(SafeBrowsingBlockingPageTest, MalwareReportsDisabled) {
|
|
|
| // Start a load.
|
| controller().LoadURL(GURL(kBadURL), content::Referrer(),
|
| - content::PAGE_TRANSITION_TYPED, std::string());
|
| + ui::PAGE_TRANSITION_TYPED, std::string());
|
|
|
| // Simulate the load causing a safe browsing interstitial to be shown.
|
| ShowInterstitial(false, kBadURL);
|
| @@ -639,7 +639,7 @@ TEST_F(SafeBrowsingBlockingPageTest, MalwareReportsToggling) {
|
|
|
| // Start a load.
|
| controller().LoadURL(GURL(kBadURL), content::Referrer(),
|
| - content::PAGE_TRANSITION_TYPED, std::string());
|
| + ui::PAGE_TRANSITION_TYPED, std::string());
|
|
|
| // Simulate the load causing a safe browsing interstitial to be shown.
|
| ShowInterstitial(false, kBadURL);
|
|
|