Separate phishing/SE ads/ SE landing interstitial UMA stats

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 524 matching lines @@
 }
 
 std::string SafeBrowsingBlockingPage::GetMetricPrefix() const {
   bool primary_subresource = unsafe_resources_[0].is_subresource;
   switch (interstitial_reason_) {
     case SB_REASON_MALWARE:
       return primary_subresource ? "malware_subresource" : "malware";
     case SB_REASON_HARMFUL:
       return primary_subresource ? "harmful_subresource" : "harmful";
     case SB_REASON_PHISHING:
-      return primary_subresource ? "phishing_subresource" : "phishing";
+      ThreatPatternType threat_pattern_type =
+          unsafe_resources_[0].threat_metadata.threat_pattern_type;
+      if (threat_pattern_type == ThreatPatternType::PHISHING ||
+          threat_pattern_type == ThreatPatternType::NONE)
+        return primary_subresource ? "phishing_subresource" : "phishing";
+      else if (threat_pattern_type == ThreatPatternType::SOCIAL_ENGINEERING_ADS)
+        return primary_subresource ? "social_engineering_ads_subresource"
+                                   : "social_engineering_ads";
+      else if (threat_pattern_type ==
+               ThreatPatternType::SOCIAL_ENGINEERING_LANDING)
+        return primary_subresource ? "social_engineering_landing_subresource"
+                                   : "social_engineering_landing";
   }
   NOTREACHED();
   return std::string();

[Nathan Parker, 2016/05/17 19:23:58]

Maybe this should return "unknown_interstitial_type" or some readable string. 
That way if SB starts sending weird enums we don't (yet) recognize, we'll at
least see the issue in UMA.

[Jialiu Lin, 2016/05/17 20:32:24]

Changed from std::string() to "unkown_metric_prefix". 
Though.. this function returns part of the UMA name, not a enum. So unless we
declare a group of interstitial.unkown_metric_prefix.* uma stats in
histograms.xml, it will not help in identifying issues. 
And this return is guarded by the NOTREACHED() statement before it, should not
get here anyway. 

 }
 
 // We populate a parallel set of metrics to differentiate some threat sources.
 std::string SafeBrowsingBlockingPage::GetExtraMetricsSuffix() const {
   switch (unsafe_resources_[0].threat_source) {
     case safe_browsing::ThreatSource::DATA_SAVER:
       return "from_data_saver";
     case safe_browsing::ThreatSource::REMOTE:
     case safe_browsing::ThreatSource::LOCAL_PVER3:
       // REMOTE and LOCAL_PVER3 can be distinguished in the logs
@@ skipping 182 matching lines @@
   } else {
     load_time_data->SetString(
         "finalParagraph",
         l10n_util::GetStringUTF16(IDS_PHISHING_V3_PROCEED_PARAGRAPH));
   }
 
   PopulateExtendedReportingOption(load_time_data);
 }
 
 }  // namespace safe_browsing