Remove TYPE_MALWARE_AND_PHISHING from Safe Browsing blocking page
commit8cf7cebb582ec1a6b3639a3b89f08ff9772ca301
authorfelt <felt@chromium.org>
Tue, 16 Sep 2014 15:05:56 +0000 (16 08:05 -0700)
committerCommit bot <commit-bot@chromium.org>
Tue, 16 Sep 2014 15:07:51 +0000 (16 15:07 +0000)
treeb5e5bcf4e5ba466a4fa7733b103cad2c03dea851
parent4879fd2c9e48ddadd001fed382163c26586476ce
Remove TYPE_MALWARE_AND_PHISHING from Safe Browsing blocking page

Delete support for TYPE_MALWARE_AND_PHISHING, since the warning now
always shows the malware warning if it's both.

BUG=
R=mattm@chromium.org

Review URL: https://codereview.chromium.org/572023003

Cr-Commit-Position: refs/heads/master@{#295067}
chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
chrome/browser/safe_browsing/safe_browsing_blocking_page.h