Deprecate Safe Browsing timing histograms

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 80 matching lines @@
 
 // The commands returned by the page when the user performs an action.
 const char kDoReportCommand[] = "doReport";
 const char kDontReportCommand[] = "dontReport";
 const char kExpandedSeeMoreCommand[] = "expandedSeeMore";
 const char kLearnMoreCommand[] = "learnMore2";
 const char kProceedCommand[] = "proceed";
 const char kShowDiagnosticCommand[] = "showDiagnostic";
 const char kShowPrivacyCommand[] = "showPrivacy";
 const char kTakeMeBackCommand[] = "takeMeBack";
-// Special command that we use when the user navigated away from the
-// page.  E.g., closed the tab or the window.  This is only used by
-// RecordUserReactionTime.
-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 kEventNameOther[] = "safebrowsing_other_interstitial_";
@@ skipping 60 matching lines @@
     : malware_details_proceed_delay_ms_(
           kMalwareDetailsProceedDelayMilliSeconds),
       ui_manager_(ui_manager),
       report_loop_(NULL),
       is_main_frame_load_blocked_(IsMainPageLoadBlocked(unsafe_resources)),
       unsafe_resources_(unsafe_resources),
       proceeded_(false),
       web_contents_(web_contents),
       url_(unsafe_resources[0].url),
       interstitial_page_(NULL),
-      has_expanded_see_more_section_(false),
       create_view_(true),
       num_visits_(-1) {
   bool malware = false;
   bool phishing = false;
   for (UnsafeResourceList::const_iterator iter = unsafe_resources_.begin();
        iter != unsafe_resources_.end(); ++iter) {
     const UnsafeResource& resource = *iter;
     SBThreatType threat_type = resource.threat_type;
     if (threat_type == SB_THREAT_TYPE_URL_MALWARE ||
         threat_type == SB_THREAT_TYPE_CLIENT_SIDE_MALWARE_URL) {
@@ skipping 74 matching lines @@
 
 SafeBrowsingBlockingPage::~SafeBrowsingBlockingPage() {
 }
 
 void SafeBrowsingBlockingPage::CommandReceived(const std::string& cmd) {
   std::string command(cmd);  // Make a local copy so we can modify it.
   // The Jasonified response has quotes, remove them.
   if (command.length() > 1 && command[0] == '"') {
     command = command.substr(1, command.length() - 2);
   }
-  RecordUserReactionTime(command);
   if (command == kDoReportCommand) {
     SetReportingPreference(true);
     return;
   }
 
   if (command == kDontReportCommand) {
     SetReportingPreference(false);
     return;
   }
 
@@ skipping 100 matching lines @@
            unsafe_resources_[element_index].threat_type ==
            SB_THREAT_TYPE_CLIENT_SIDE_MALWARE_URL);
     OpenURLParams params(
         diagnostic_url, Referrer(), CURRENT_TAB, content::PAGE_TRANSITION_LINK,
         false);
     web_contents_->OpenURL(params);
     return;
   }
 
   if (command == kExpandedSeeMoreCommand) {
-    // User expanded the "see more info" section of the page.  We don't actually
-    // do any action based on this, it's just so that RecordUserReactionTime can
-    // track it.
-
 #if defined(ENABLE_EXTENSIONS)
     // ExperienceSampling: We track that the user expanded the details.
     if (sampling_event_.get())
       sampling_event_->set_has_viewed_details(true);
 #endif
     return;
   }
 
   NOTREACHED() << "Unexpected command: " << command;
 }
@@ skipping 53 matching lines @@
 void SafeBrowsingBlockingPage::Show() {
   DCHECK(!interstitial_page_);
   interstitial_page_ = InterstitialPage::Create(
       web_contents_, is_main_frame_load_blocked_, url_, this);
   if (!create_view_)
     interstitial_page_->DontCreateViewForTesting();
   interstitial_page_->Show();
 }
 
 void SafeBrowsingBlockingPage::OnDontProceed() {
-  // Calling this method twice will not double-count.
-  RecordUserReactionTime(kNavigatedAwayMetaCommand);
   // We could have already called Proceed(), in which case we must not notify
   // the SafeBrowsingUIManager again, as the client has been deleted.
   if (proceeded_)
     return;
 
   RecordUserAction(DONT_PROCEED);
   // Send the malware details, if we opted to.
   FinishMalwareDetails(0);  // No delay
 
   NotifySafeBrowsingUIManager(ui_manager_, unsafe_resources_, false);
@@ skipping 134 matching lines @@
       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) {
-    // 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);
-    } else if (command == kShowPrivacyCommand) {
-      UMA_HISTOGRAM_MEDIUM_TIMES("SB2.MalwareInterstitialTimePrivacyPolicy",
-                                 dt);
-    } else if (command == kLearnMoreCommand) {
-      UMA_HISTOGRAM_MEDIUM_TIMES("SB2.MalwareInterstitialLearnMore",
-                                 dt);
-    } else if (command == kNavigatedAwayMetaCommand) {
-      UMA_HISTOGRAM_MEDIUM_TIMES("SB2.MalwareInterstitialTimeClosed", dt);
-    } else if (command == kExpandedSeeMoreCommand) {
-      // Only record the expanded histogram once per display of the
-      // interstitial.
-      if (has_expanded_see_more_section_)
-        return;
-      RecordUserAction(SHOW_ADVANCED);
-      UMA_HISTOGRAM_MEDIUM_TIMES("SB2.MalwareInterstitialTimeExpandedSeeMore",
-                                 dt);
-      has_expanded_see_more_section_ = true;
-      // Expanding the "See More" section doesn't finish the interstitial, so
-      // don't mark the reaction time as recorded.
-      recorded = false;
-    } else {
-      recorded = false;
-    }
-  } else {
-    // Same as above but for phishing warnings.
-    if (command == kProceedCommand) {
-      UMA_HISTOGRAM_MEDIUM_TIMES("SB2.PhishingInterstitialTimeProceed", dt);
-    } else if (command == kTakeMeBackCommand) {
-      UMA_HISTOGRAM_MEDIUM_TIMES("SB2.PhishingInterstitialTimeTakeMeBack", dt);
-    } else if (command == kShowDiagnosticCommand) {
-      UMA_HISTOGRAM_MEDIUM_TIMES("SB2.PhishingInterstitialTimeReportError", dt);
-    } else if (command == kLearnMoreCommand) {
-      UMA_HISTOGRAM_MEDIUM_TIMES("SB2.PhishingInterstitialTimeLearnMore", dt);
-    } else if (command == kNavigatedAwayMetaCommand) {
-      UMA_HISTOGRAM_MEDIUM_TIMES("SB2.PhishingInterstitialTimeClosed", dt);
-    } else if (command == kExpandedSeeMoreCommand) {
-      // Only record the expanded histogram once per display of the
-      // interstitial.
-      if (has_expanded_see_more_section_)
-        return;
-      RecordUserAction(SHOW_ADVANCED);
-      UMA_HISTOGRAM_MEDIUM_TIMES("SB2.PhishingInterstitialTimeExpandedSeeMore",
-                                 dt);
-      has_expanded_see_more_section_ = true;
-      // Expanding the "See More" section doesn't finish the interstitial, so
-      // don't mark the reaction time as recorded.
-      recorded = false;
-    } else {
-      recorded = false;
-    }
-  }
-  if (recorded)  // Making sure we don't double-count reaction times.
-    interstitial_show_time_ = base::TimeTicks();  //  Resets the show time.
-}
-
 void SafeBrowsingBlockingPage::FinishMalwareDetails(int64 delay_ms) {
   if (malware_details_.get() == NULL)
     return;  // Not all interstitials have malware details (eg phishing).
 
   const bool enabled =
       IsPrefEnabled(prefs::kSafeBrowsingExtendedReportingEnabled);
   UMA_HISTOGRAM_BOOLEAN("SB2.ExtendedReportingIsEnabled", enabled);
   if (enabled) {
     // Finish the malware details collection, send it over.
     BrowserThread::PostDelayedTask(
@@ skipping 106 matching lines @@
       l10n_util::GetStringUTF16(IDS_SAFEBROWSING_OVERRIDABLE_SAFETY_BUTTON));
   load_time_data.SetBoolean(
       "overridable",
       !IsPrefEnabled(prefs::kSafeBrowsingProceedAnywayDisabled));
 
   if (interstitial_type_ == TYPE_PHISHING)
     PopulatePhishingLoadTimeData(&load_time_data);
   else
     PopulateMalwareLoadTimeData(&load_time_data);
 
-  interstitial_show_time_ = base::TimeTicks::Now();
-
   base::StringPiece html(
       ResourceBundle::GetSharedInstance().GetRawDataResource(
           IRD_SECURITY_INTERSTITIAL_HTML));
   webui::UseVersion2 version;
   return webui::GetI18nTemplateHtml(html, &load_time_data);
 }
 
 void SafeBrowsingBlockingPage::PopulateMalwareLoadTimeData(
     base::DictionaryValue* load_time_data) {
   load_time_data->SetBoolean("phishing", false);
@@ skipping 46 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));
 }