Revert 14569

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14573 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 1 insertions, 43 deletions

diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
index 1bf0a97..fd07b9d6 100644
--- a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
@@ -6,7 +6,6 @@
 
 #include "chrome/browser/safe_browsing/safe_browsing_blocking_page.h"
 
-#include "base/histogram.h"
 #include "base/string_util.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/dom_operation_notification_details.h"
@@ -50,21 +49,6 @@ static const char* const kLearnMoreCommand = "learnMore";
 static const char* const kProceedCommand = "proceed";
 static const char* const kTakeMeBackCommand = "takeMeBack";
 
-namespace {
-
-enum SafeBrowsingBlockingPageEvent {
-  SHOW,
-  PROCEED,
-  DONT_PROCEED,
-};
-
-void RecordSafeBrowsingBlockingPageStats(SafeBrowsingBlockingPageEvent event) {
-  static LinearHistogram histogram("interstial.safe_browsing", 0, 2, 4);
-  histogram.SetFlags(kUmaTargetedHistogramFlag);
-  histogram.Add(event);
-}
-
-}  // namespace
 // static
 SafeBrowsingBlockingPageFactory* SafeBrowsingBlockingPage::factory_ = NULL;
 
@@ -99,7 +83,6 @@ SafeBrowsingBlockingPage::SafeBrowsingBlockingPage(
       sb_service_(sb_service),
       is_main_frame_(IsMainPage(unsafe_resources)),
       unsafe_resources_(unsafe_resources) {
-  RecordSafeBrowsingBlockingPageStats(SHOW);
   if (!is_main_frame_) {
     navigation_entry_index_to_remove_ =
         tab()->controller().last_committed_entry_index();
@@ -379,8 +362,6 @@ void SafeBrowsingBlockingPage::CommandReceived(const std::string& cmd) {
 }
 
 void SafeBrowsingBlockingPage::Proceed() {
-  RecordSafeBrowsingBlockingPageStats(PROCEED);
-
   NotifySafeBrowsingService(sb_service_, unsafe_resources_, true);
 
   // Check to see if some new notifications of unsafe resources have been
@@ -406,8 +387,6 @@ void SafeBrowsingBlockingPage::Proceed() {
 }
 
 void SafeBrowsingBlockingPage::DontProceed() {
-  RecordSafeBrowsingBlockingPageStats(DONT_PROCEED);
-
   NotifySafeBrowsingService(sb_service_, unsafe_resources_, false);
 
   // The user does not want to proceed, clear the queued unsafe resources
diff --git a/chrome/browser/ssl/ssl_blocking_page.cc b/chrome/browser/ssl/ssl_blocking_page.cc
index a34c86a..ce9d9da 100644
--- a/chrome/browser/ssl/ssl_blocking_page.cc
+++ b/chrome/browser/ssl/ssl_blocking_page.cc
@@ -4,7 +4,6 @@
 
 #include "chrome/browser/ssl/ssl_blocking_page.h"
 
-#include "base/histogram.h"
 #include "base/string_piece.h"
 #include "base/values.h"
 #include "chrome/browser/browser.h"
@@ -23,22 +22,6 @@
 #include "grit/browser_resources.h"
 #include "grit/generated_resources.h"
 
-namespace {
-
-enum SSLBlockingPageEvent {
-  SHOW,
-  PROCEED,
-  DONT_PROCEED,
-};
-
-void RecordSSLBlockingPageStats(SSLBlockingPageEvent event) {
-  static LinearHistogram histogram("interstial.ssl", 0, 2, 4);
-  histogram.SetFlags(kUmaTargetedHistogramFlag);
-  histogram.Add(event);
-}
-
-}  // namespace
-
 // Note that we always create a navigation entry with SSL errors.
 // No error happening loading a sub-resource triggers an interstitial so far.
 SSLBlockingPage::SSLBlockingPage(SSLManager::CertError* error,
@@ -47,7 +30,6 @@ SSLBlockingPage::SSLBlockingPage(SSLManager::CertError* error,
       error_(error),
       delegate_(delegate),
       delegate_has_been_notified_(false) {
-  RecordSSLBlockingPageStats(SHOW);
 }
 
 SSLBlockingPage::~SSLBlockingPage() {
@@ -112,8 +94,6 @@ void SSLBlockingPage::CommandReceived(const std::string& command) {
 }
 
 void SSLBlockingPage::Proceed() {
-  RecordSSLBlockingPageStats(PROCEED);
-
   // Accepting the certificate resumes the loading of the page.
   NotifyAllowCertificate();
 
@@ -122,12 +102,11 @@ void SSLBlockingPage::Proceed() {
 }
 
 void SSLBlockingPage::DontProceed() {
-  RecordSSLBlockingPageStats(DONT_PROCEED);
-
   NotifyDenyCertificate();
   InterstitialPage::DontProceed();
 }
 
+
 void SSLBlockingPage::NotifyDenyCertificate() {
   DCHECK(!delegate_has_been_notified_);