Revert 107528 - Collect some histograms about signed binary downloads.

chrome/browser/safe_browsing/safe_browsing_service.h

 // Copyright (c) 2011 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.
 //
 // The Safe Browsing service is responsible for downloading anti-phishing and
 // anti-malware tables and checking urls against them.
 
 #ifndef CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_SERVICE_H_
 #define CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_SERVICE_H_
 #pragma once
 
 #include <deque>
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/hash_tables.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "base/synchronization/lock.h"
 #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"
 
 class MalwareDetails;
 class PrefChangeRegistrar;
 class PrefService;
 class SafeBrowsingDatabase;
 class SafeBrowsingProtocolManager;
 class SafeBrowsingServiceFactory;
 
 namespace base {
 class Thread;
 }
 
 namespace net {
 class URLRequestContextGetter;
 }
 
 namespace safe_browsing {
 class ClientSideDetectionService;
 class DownloadProtectionService;
 }
 
 // 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;
   // Users of this service implement this interface to be notified
   // asynchronously of the result.
   enum UrlCheckResult {
     SAFE,
     URL_PHISHING,
     URL_MALWARE,
     BINARY_MALWARE_URL,  // Binary url leads to a malware.
@@ skipping 197 matching lines @@
 
   bool download_protection_enabled() const {
     return enabled_ && enable_download_protection_;
   }
 
   safe_browsing::ClientSideDetectionService*
       safe_browsing_detection_service() const {
     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();
   }
 
   // Preference handling.
   static void RegisterPrefs(PrefService* prefs);
 
   // Called on the IO thread to reset the database.
   void ResetDatabase();
@@ skipping 38 matching lines @@
   // Used for whitelisting a render view when the user ignores our warning.
   struct WhiteListedEntry;
 
   // Clients that we've queued up for checking later once the database is ready.
   struct QueuedCheck {
     Client* client;
     GURL url;
     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.
   void OnIOInitialize(const std::string& client_key,
                       const std::string& wrapped_key,
                       net::URLRequestContextGetter* request_context_getter);
 
   // Called to shutdown operations on the io_thread.
   void OnIOShutdown();
 
@@ skipping 210 matching lines @@
 
   // Used to track creation and destruction of profiles on the UI thread.
   content::NotificationRegistrar prefs_registrar_;
 
   // The ClientSideDetectionService is managed by the SafeBrowsingService,
   // since its running state and lifecycle depends on SafeBrowsingService's.
   scoped_ptr<safe_browsing::ClientSideDetectionService> csd_service_;
 
   // 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);
 };
 
 // Factory for creating SafeBrowsingService.  Useful for tests.
 class SafeBrowsingServiceFactory {
  public:
   SafeBrowsingServiceFactory() { }
   virtual ~SafeBrowsingServiceFactory() { }
   virtual SafeBrowsingService* CreateSafeBrowsingService() = 0;
  private:
   DISALLOW_COPY_AND_ASSIGN(SafeBrowsingServiceFactory);
 };
 
 #endif  // CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_SERVICE_H_