Fourth patch in getting rid of caching MessageLoop pointers.

chrome/browser/safe_browsing/safe_browsing_service.h

 // Copyright (c) 2009 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_
 
 #include <deque>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/hash_tables.h"
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
 #include "base/thread.h"
 #include "base/time.h"
 #include "chrome/browser/safe_browsing/safe_browsing_util.h"
 #include "googleurl/src/gurl.h"
 #include "webkit/glue/resource_type.h"
 
 class BloomFilter;
-class MessageLoop;
 class PrefService;
 class SafeBrowsingBlockingPage;
 class SafeBrowsingDatabase;
 class SafeBrowsingProtocolManager;
 
 // Construction needs to happen on the main thread.
 class SafeBrowsingService
     : public base::RefCountedThreadSafe<SafeBrowsingService> {
  public:
   // Users of this service implement this interface to be notified
@@ skipping 24 matching lines @@
     UrlCheckResult threat_type;
     Client* client;
     int render_process_host_id;
     int render_view_id;
   };
 
   // Creates the safe browsing service.  Need to initialize before using.
   SafeBrowsingService();
   ~SafeBrowsingService();
 
-  // Initializes the service.  io_loop is the message loop that the
-  // caller of this service (ResourceDispatcherHost) wants to be notified on
-  // for check results.
-  void Initialize(MessageLoop* io_loop);
+  // Initializes the service.
+  void Initialize();
 
   // Called to initialize objects that are used on the io_thread.
-  void OnIOInitialize(MessageLoop* notify_loop,
-                      const std::string& client_key,
+  void OnIOInitialize(const std::string& client_key,
                       const std::string& wrapped_key);
 
   // Called to initialize objects that are used on the db_thread.
   void OnDBInitialize();
 
   // Called to shutdown operations on the io_thread.
   void OnIOShutdown();
 
   // Called on the main thread to let us know that the io_thread is going away.
   void ShutDown();
@@ skipping 138 matching lines @@
   // Invoked on the UI thread to show the blocking page.
   void DoDisplayBlockingPage(const UnsafeResource& resource);
 
   // During a reset or the initial load we may have to queue checks until the
   // database is ready. This method is run once the database has loaded (or if
   // we shut down SafeBrowsing before the database has finished loading).
   void RunQueuedClients();
 
   void OnUpdateComplete(bool update_succeeded);
 
-  MessageLoop* io_loop_;
-
   typedef std::set<SafeBrowsingCheck*> CurrentChecks;
   CurrentChecks checks_;
 
   // Used for issuing only one GetHash request for a given prefix.
   typedef std::vector<SafeBrowsingCheck*> GetHashRequestors;
   typedef base::hash_map<SBPrefix, GetHashRequestors> GetHashRequests;
   GetHashRequests gethash_requests_;
 
   // The sqlite database.  We don't use a scoped_ptr because it needs to be
   // destructed on a different thread than this object.
@@ skipping 33 matching lines @@
     Client* client;
     GURL url;
     base::Time start;
   } QueuedCheck;
   std::deque<QueuedCheck> queued_checks_;
 
   DISALLOW_COPY_AND_ASSIGN(SafeBrowsingService);
 };
 
 #endif  // CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_SERVICE_H_