Remove stl_util's deletion function use from chrome/.

chrome/browser/safe_browsing/local_database_manager.h

 // 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.
 //
 // Safe Browsing Database Manager implementation that manages a local
 // database.  This is used by Desktop Chromium.
 
 #ifndef CHROME_BROWSER_SAFE_BROWSING_LOCAL_DATABASE_MANAGER_H_
 #define CHROME_BROWSER_SAFE_BROWSING_LOCAL_DATABASE_MANAGER_H_
 
@@ skipping 27 matching lines @@
 }
 
 namespace safe_browsing {
 
 class SafeBrowsingService;
 class SafeBrowsingDatabase;
 class ClientSideDetectionService;
 class DownloadProtectionService;
 struct V4ProtocolConfig;
 
-// Implemetation that manages a local database on disk.
+// Implementation that manages a local database on disk.
 //
 // Construction needs to happen on the main thread.
 class LocalSafeBrowsingDatabaseManager
     : public SafeBrowsingDatabaseManager,
       public SafeBrowsingProtocolManagerDelegate {
  public:
   // Bundle of SafeBrowsing state while performing a URL or hash prefix check.
   struct SafeBrowsingCheck {
     // |check_type| should correspond to the type of item that is being
     // checked, either a URL or a binary hash/URL. We store this for two
@@ skipping 92 matching lines @@
 
   friend class base::RefCountedThreadSafe<LocalSafeBrowsingDatabaseManager>;
   friend class SafeBrowsingServerTest;
   friend class SafeBrowsingServiceTest;
   friend class SafeBrowsingServiceTestHelper;
   friend class LocalDatabaseManagerTest;
   FRIEND_TEST_ALL_PREFIXES(LocalDatabaseManagerTest, GetUrlSeverestThreatType);
   FRIEND_TEST_ALL_PREFIXES(LocalDatabaseManagerTest,
                            ServiceStopWithPendingChecks);
 
-  typedef std::set<SafeBrowsingCheck*> CurrentChecks;
   typedef std::vector<SafeBrowsingCheck*> GetHashRequestors;
   typedef base::hash_map<SBPrefix, GetHashRequestors> GetHashRequests;
 
   // Clients that we've queued up for checking later once the database is ready.
   struct QueuedCheck {
     QueuedCheck(const ListType check_type,
                 Client* client,
                 const GURL& url,
                 const std::vector<SBThreatType>& expected_threats,
                 const base::TimeTicks& start);
@@ skipping 125 matching lines @@
   std::vector<SBPrefix> CheckResourceUrlOnSBThread(
       const std::vector<SBPrefix>& prefixes);
 
   // Helper function that calls safe browsing client and cleans up |checks_|.
   void SafeBrowsingCheckDone(SafeBrowsingCheck* check);
 
   // Helper function to set |check| with default values and start a safe
   // browsing check with timeout of |timeout|. |task| will be called on
   // success, otherwise TimeoutCallback will be called.
   void StartSafeBrowsingCheck(
-      SafeBrowsingCheck* check,
+      std::unique_ptr<SafeBrowsingCheck> check,
       const base::Callback<std::vector<SBPrefix>(void)>& task);
 
   // SafeBrowsingProtocolManageDelegate override
   void ResetDatabase() override;
   void UpdateStarted() override;
   void UpdateFinished(bool success) override;
   void GetChunks(GetChunksCallback callback) override;
   void AddChunks(
       const std::string& list,
       std::unique_ptr<std::vector<std::unique_ptr<SBChunkData>>> chunks,
       AddChunksCallback callback) override;
   void DeleteChunks(
       std::unique_ptr<std::vector<SBChunkDelete>> chunk_deletes) override;
 
   scoped_refptr<SafeBrowsingService> sb_service_;
 
-  CurrentChecks checks_;
+  std::map<SafeBrowsingCheck*, std::unique_ptr<SafeBrowsingCheck>> checks_;
 
   // Used for issuing only one GetHash request for a given prefix.
   GetHashRequests gethash_requests_;
 
   // The persistent database.  We don't use a std::unique_ptr because it
   // needs to be destroyed on a different thread than this object.
   SafeBrowsingDatabase* database_;
 
   // Lock used to prevent possible data races due to compiler optimizations.
   mutable base::Lock database_lock_;
 
   // Whether the service is running. 'enabled_' is used by the
   // SafeBrowsingDatabaseManager on the IO thread during normal operations.
   bool enabled_;
 
   // Indicate if download_protection is enabled by command switch
-  // so we allow this feature to be exersized.
+  // so we allow this feature to be exercised.
   bool enable_download_protection_;
 
   // Indicate if client-side phishing detection whitelist should be enabled
   // or not.
   bool enable_csd_whitelist_;
 
   // Indicate if the download whitelist should be enabled or not.
   bool enable_download_whitelist_;
 
   // Indicate if the extension blacklist should be enabled.
@@ skipping 26 matching lines @@
 
   // Timeout to use for safe browsing checks.
   base::TimeDelta check_timeout_;
 
   DISALLOW_COPY_AND_ASSIGN(LocalSafeBrowsingDatabaseManager);
 };  // class LocalSafeBrowsingDatabaseManager
 
 }  // namespace safe_browsing
 
 #endif  // CHROME_BROWSER_SAFE_BROWSING_LOCAL_DATABASE_MANAGER_H_