Remove TYPE_MALWARE_AND_PHISHING from Safe Browsing blocking page

chrome/browser/safe_browsing/safe_browsing_blocking_page.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.
 //
 // Implementation of the SafeBrowsingBlockingPage class.
 
 #include "chrome/browser/safe_browsing/safe_browsing_blocking_page.h"
 
 #include <string>
 
@@ skipping 97 matching lines @@
 const char kNavigatedAwayMetaCommand[] = "closed";
 
 // Other constants used to communicate with the JavaScript.
 const char kBoxChecked[] = "boxchecked";
 const char kDisplayCheckBox[] = "displaycheckbox";
 
 // Constants for the Experience Sampling instrumentation.
 #if defined(ENABLE_EXTENSIONS)
 const char kEventNameMalware[] = "safebrowsing_interstitial_";
 const char kEventNamePhishing[] = "phishing_interstitial_";
-const char kEventNameMalwareAndPhishing[] =
-    "malware_and_phishing_interstitial_";
 const char kEventNameOther[] = "safebrowsing_other_interstitial_";
 #endif
 
 base::LazyInstance<SafeBrowsingBlockingPage::UnsafeResourceMap>
     g_unsafe_resource_map = LAZY_INSTANCE_INITIALIZER;
 
 // This enum is used for a histogram.  Don't reorder, delete, or insert
 // elements.  New elements should be added before MAX_ACTION only.
 enum DetailedDecision {
   MALWARE_SHOW_NEW_SITE = 0,
@@ skipping 70 matching lines @@
     if (threat_type == SB_THREAT_TYPE_URL_MALWARE ||
         threat_type == SB_THREAT_TYPE_CLIENT_SIDE_MALWARE_URL) {
       malware = true;
     } else {
       DCHECK(threat_type == SB_THREAT_TYPE_URL_PHISHING ||
              threat_type == SB_THREAT_TYPE_CLIENT_SIDE_PHISHING_URL);
       phishing = true;
     }
   }
   DCHECK(phishing || malware);
-  if (malware && phishing)
-    interstitial_type_ = TYPE_MALWARE_AND_PHISHING;
-  else if (malware)
+  if (malware)
     interstitial_type_ = TYPE_MALWARE;
   else
     interstitial_type_ = TYPE_PHISHING;
 
   RecordUserAction(SHOW);
   HistoryService* history_service = HistoryServiceFactory::GetForProfile(
           Profile::FromBrowserContext(web_contents->GetBrowserContext()),
           Profile::EXPLICIT_ACCESS);
   if (history_service) {
     history_service->GetVisibleVisitCountToHost(
@@ skipping 20 matching lines @@
       malware_details_.get() == NULL && CanShowMalwareDetailsOption()) {
     malware_details_ = MalwareDetails::NewMalwareDetails(
         ui_manager_, web_contents, unsafe_resources[0]);
   }
 
 #if defined(ENABLE_EXTENSIONS)
   // ExperienceSampling: Set up new sampling event for this interstitial.
   // This needs to handle all types of warnings this interstitial can show.
   std::string event_name;
   switch (interstitial_type_) {
-    case TYPE_MALWARE_AND_PHISHING:
-      event_name = kEventNameMalwareAndPhishing;
-      break;
     case TYPE_MALWARE:
       event_name = kEventNameMalware;
       break;
     case TYPE_PHISHING:
       event_name = kEventNamePhishing;
       break;
     default:
       event_name = kEventNameOther;
       break;
   }
@@ skipping 309 matching lines @@
     PHISHING_PROCEED,
     MALWARE_SHOW_ADVANCED,
     MULTIPLE_SHOW_ADVANCED,
     PHISHING_SHOW_ADVANCED,
     MAX_ACTION
   } histogram_action = MAX_ACTION;
 
   switch (event) {
     case SHOW:
       switch (interstitial_type_) {
-        case TYPE_MALWARE_AND_PHISHING:
-          histogram_action = MULTIPLE_SHOW;
-          break;
         case TYPE_MALWARE:
           histogram_action = MALWARE_SHOW;
           break;
         case TYPE_PHISHING:
           histogram_action = PHISHING_SHOW;
           break;
       }
       break;
     case PROCEED:
       switch (interstitial_type_) {
-        case TYPE_MALWARE_AND_PHISHING:
-          histogram_action = MULTIPLE_PROCEED;
-          break;
         case TYPE_MALWARE:
           histogram_action = MALWARE_PROCEED;
           break;
         case TYPE_PHISHING:
           histogram_action = PHISHING_PROCEED;
           break;
       }
       break;
     case DONT_PROCEED:
       if (IsPrefEnabled(prefs::kSafeBrowsingProceedAnywayDisabled)) {
         switch (interstitial_type_) {
-          case TYPE_MALWARE_AND_PHISHING:
-            histogram_action = MULTIPLE_FORCED_DONT_PROCEED;
-            break;
           case TYPE_MALWARE:
             histogram_action = MALWARE_FORCED_DONT_PROCEED;
             break;
           case TYPE_PHISHING:
             histogram_action = PHISHING_FORCED_DONT_PROCEED;
             break;
         }
       } else {
         switch (interstitial_type_) {
-          case TYPE_MALWARE_AND_PHISHING:
-            histogram_action = MULTIPLE_DONT_PROCEED;
-            break;
           case TYPE_MALWARE:
             histogram_action = MALWARE_DONT_PROCEED;
             break;
           case TYPE_PHISHING:
             histogram_action = PHISHING_DONT_PROCEED;
             break;
         }
       }
       break;
     case SHOW_ADVANCED:
       switch (interstitial_type_) {
-        case TYPE_MALWARE_AND_PHISHING:
-          histogram_action = MULTIPLE_SHOW_ADVANCED;
-          break;
         case TYPE_MALWARE:
           histogram_action = MALWARE_SHOW_ADVANCED;
           break;
         case TYPE_PHISHING:
           histogram_action = PHISHING_SHOW_ADVANCED;
           break;
       }
       break;
     default:
       NOTREACHED() << "Unexpected event: " << event;
   }
   if (histogram_action == MAX_ACTION) {
     NOTREACHED();
   } else {
     UMA_HISTOGRAM_ENUMERATION("SB2.InterstitialAction", histogram_action,
                               MAX_ACTION);
   }
 
   if (event == PROCEED || event == DONT_PROCEED) {
-    if (num_visits_ == 0 && interstitial_type_ != TYPE_MALWARE_AND_PHISHING) {
+    if (num_visits_ == 0) {
       RecordDetailedUserAction((interstitial_type_ == TYPE_MALWARE) ?
                                MALWARE_SHOW_NEW_SITE : PHISHING_SHOW_NEW_SITE);
       if (event == PROCEED) {
         RecordDetailedUserAction((interstitial_type_ == TYPE_MALWARE) ?
             MALWARE_PROCEED_NEW_SITE : PHISHING_PROCEED_NEW_SITE);
       }
     }
-    if (unsafe_resources_[0].is_subresource &&
-        interstitial_type_ != TYPE_MALWARE_AND_PHISHING) {
+    if (unsafe_resources_[0].is_subresource) {
       RecordDetailedUserAction((interstitial_type_ == TYPE_MALWARE) ?
           MALWARE_SHOW_CROSS_SITE : PHISHING_SHOW_CROSS_SITE);
       if (event == PROCEED) {
         RecordDetailedUserAction((interstitial_type_ == TYPE_MALWARE) ?
             MALWARE_PROCEED_CROSS_SITE : PHISHING_PROCEED_CROSS_SITE);
       }
     }
   }
 }
 
 void SafeBrowsingBlockingPage::RecordUserReactionTime(
     const std::string& command) {
   if (interstitial_show_time_.is_null())
     return;  // We already reported the user reaction time.
   base::TimeDelta dt = base::TimeTicks::Now() - interstitial_show_time_;
   DVLOG(1) << "User reaction time for command:" << command
            << " on interstitial_type_:" << interstitial_type_
            << " warning took " << dt.InMilliseconds() << "ms";
   bool recorded = true;
-  if (interstitial_type_ == TYPE_MALWARE ||
-      interstitial_type_ == TYPE_MALWARE_AND_PHISHING) {
+  if (interstitial_type_ == TYPE_MALWARE) {
     // There are six ways in which the malware interstitial can go
     // away.  We handle all of them here but we group two together: closing the
     // tag / browser window and clicking on the back button in the browser (not
     // the big green button) are considered the same action.
     if (command == kProceedCommand) {
       UMA_HISTOGRAM_MEDIUM_TIMES("SB2.MalwareInterstitialTimeProceed", dt);
     } else if (command == kTakeMeBackCommand) {
       UMA_HISTOGRAM_MEDIUM_TIMES("SB2.MalwareInterstitialTimeTakeMeBack", dt);
     } else if (command == kShowDiagnosticCommand) {
       UMA_HISTOGRAM_MEDIUM_TIMES("SB2.MalwareInterstitialTimeDiagnostic", dt);
@@ skipping 239 matching lines @@
           IDS_PHISHING_V3_PRIMARY_PARAGRAPH,
           base::UTF8ToUTF16(url_.host())));
   load_time_data->SetString(
       "explanationParagraph",
       l10n_util::GetStringFUTF16(IDS_PHISHING_V3_EXPLANATION_PARAGRAPH,
                                  base::UTF8ToUTF16(url_.host())));
   load_time_data->SetString(
       "finalParagraph",
       l10n_util::GetStringUTF16(IDS_PHISHING_V3_PROCEED_PARAGRAPH));
 }