Revert 107528 - Collect some histograms about signed binary downloads.

chrome/browser/safe_browsing/safe_browsing_service.h

Index: chrome/browser/safe_browsing/safe_browsing_service.h
===================================================================
--- chrome/browser/safe_browsing/safe_browsing_service.h	(revision 107537)
+++ chrome/browser/safe_browsing/safe_browsing_service.h	(working copy)
@@ -23,7 +23,6 @@
 #include "base/task.h"
 #include "base/time.h"
 #include "chrome/browser/safe_browsing/safe_browsing_util.h"
-#include "content/browser/browser_thread.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "googleurl/src/gurl.h"
@@ -50,8 +49,7 @@
 
 // Construction needs to happen on the main thread.
 class SafeBrowsingService
-    : public base::RefCountedThreadSafe<SafeBrowsingService,
-                                        BrowserThread::DeleteOnUIThread>,
+    : public base::RefCountedThreadSafe<SafeBrowsingService>,
       public content::NotificationObserver {
  public:
   class Client;
@@ -269,8 +267,6 @@
     return csd_service_.get();
   }
 
-  // The DownloadProtectionService is not valid after the SafeBrowsingService
-  // is destroyed.
   safe_browsing::DownloadProtectionService*
       download_protection_service() const {
     return download_service_.get();
@@ -329,8 +325,7 @@
     base::TimeTicks start;  // When check was queued.
   };
 
-  friend struct BrowserThread::DeleteOnThread<BrowserThread::UI>;
-  friend class DeleteTask<SafeBrowsingService>;
+  friend class base::RefCountedThreadSafe<SafeBrowsingService>;
   friend class SafeBrowsingServiceTest;
 
   // Called to initialize objects that are used on the io_thread.
@@ -561,7 +556,7 @@
 
   // The DownloadProtectionService is managed by the SafeBrowsingService,
   // since its running state and lifecycle depends on SafeBrowsingService's.
-  scoped_ptr<safe_browsing::DownloadProtectionService> download_service_;
+  scoped_refptr<safe_browsing::DownloadProtectionService> download_service_;
 
   DISALLOW_COPY_AND_ASSIGN(SafeBrowsingService);
 };