diff options
| -rw-r--r-- | chrome/browser/resources/safe_browsing_phishing_block.html | 2 | ||||
| -rw-r--r-- | chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc | 26 |
2 files changed, 4 insertions, 24 deletions
diff --git a/chrome/browser/resources/safe_browsing_phishing_block.html b/chrome/browser/resources/safe_browsing_phishing_block.html index 46d400a..5a68b52 100644 --- a/chrome/browser/resources/safe_browsing_phishing_block.html +++ b/chrome/browser/resources/safe_browsing_phishing_block.html @@ -1,5 +1,5 @@ <!DOCTYPE html> -<html i18n-values="dir:textdirection"> +<html id="template_root" i18n-values="dir:textdirection"> <head> <title i18n-content="title"></title> <style> diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc index f0b61f8..fa30068 100644 --- a/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc +++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc @@ -177,14 +177,7 @@ IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageTest, MalwareProceed) { EXPECT_EQ(url, browser()->GetSelectedTabContents()->GetURL()); } -// Disabled because of bug in parsing output: 64792. -#if defined(OS_WIN) -#define MAYBE_PhishingDontProceed DISABLED_PhishingDontProceed -#else -#define MAYBE_PhishingDontProceed PhishingDontProceed -#endif -IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageTest, - MAYBE_PhishingDontProceed) { +IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageTest, PhishingDontProceed) { GURL url = test_server()->GetURL(kEmptyPage); AddURLResult(url, SafeBrowsingService::URL_PHISHING); @@ -208,14 +201,7 @@ IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageTest, PhishingProceed) { EXPECT_EQ(url, browser()->GetSelectedTabContents()->GetURL()); } -// Disabled because of bug in parsing output: 64792. -#if defined(OS_WIN) -#define MAYBE_PhishingReportError DISABLED_PhishingReportError -#else -#define MAYBE_PhishingReportError PhishingReportError -#endif -IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageTest, - MAYBE_PhishingReportError) { +IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageTest, PhishingReportError) { GURL url = test_server()->GetURL(kEmptyPage); AddURLResult(url, SafeBrowsingService::URL_PHISHING); @@ -230,13 +216,7 @@ IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageTest, browser()->GetSelectedTabContents()->GetURL().path()); } -// Disabled because of bug in parsing output: 64792. -#if defined(OS_WIN) -#define MAYBE_PhishingLearnMore DISABLED_PhishingLearnMore -#else -#define MAYBE_PhishingLearnMore PhishingLearnMore -#endif -IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageTest, MAYBE_PhishingLearnMore) { +IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageTest, PhishingLearnMore) { GURL url = test_server()->GetURL(kEmptyPage); AddURLResult(url, SafeBrowsingService::URL_PHISHING); |