Remove stl_util's STLDeleteContainerPairFirstPointers.

chrome/browser/safe_browsing/protocol_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.
 
 #ifndef CHROME_BROWSER_SAFE_BROWSING_PROTOCOL_MANAGER_H_
 #define CHROME_BROWSER_SAFE_BROWSING_PROTOCOL_MANAGER_H_
 
 // A class that implements Chrome's interface with the SafeBrowsing protocol.
 // See https://developers.google.com/safe-browsing/developers_guide_v2 for
 // protocol details.
 //
 // The SafeBrowsingProtocolManager handles formatting and making requests of,
 // and handling responses from, Google's SafeBrowsing servers. This class uses
 // The SafeBrowsingProtocolParser class to do the actual parsing.
 
 #include <stddef.h>
 
+#include <algorithm>
 #include <deque>
 #include <memory>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/containers/hash_tables.h"
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "base/time/time.h"
@@ skipping 255 matching lines @@
   // Map of GetHash requests to parameters which created it.
   struct FullHashDetails {
     FullHashDetails();
     FullHashDetails(FullHashCallback callback, bool is_download);
     FullHashDetails(const FullHashDetails& other);
     ~FullHashDetails();
 
     FullHashCallback callback;
     bool is_download;
   };
-  using HashRequests = base::hash_map<const net::URLFetcher*, FullHashDetails>;
 
   // The factory that controls the creation of SafeBrowsingProtocolManager.
   // This is used by tests.
   static SBProtocolManagerFactory* factory_;
 
   // Our delegate.
   SafeBrowsingProtocolManagerDelegate* delegate_;
 
   // Current active request (in case we need to cancel) for updates or chunks
   // from the SafeBrowsing service. We can only have one of these outstanding
@@ skipping 23 matching lines @@
   base::TimeDelta next_update_interval_;
   base::OneShotTimer update_timer_;
 
   // timeout_timer_ is used to interrupt update requests which are taking
   // too long.
   base::OneShotTimer timeout_timer_;
 
   // All chunk requests that need to be made.
   std::deque<ChunkUrl> chunk_request_urls_;
 
-  HashRequests hash_requests_;
+  base::hash_map<const net::URLFetcher*,
+                 std::pair<std::unique_ptr<net::URLFetcher>, FullHashDetails>>
+      hash_requests_;
 
   // True if the service has been given an add/sub chunk but it hasn't been
   // added to the database yet.
   bool chunk_pending_to_write_;
 
   // The last time we successfully received an update.
   base::Time last_update_;
 
   // While in GetHash backoff, we can't make another GetHash until this time.
   base::Time next_gethash_time_;
@@ skipping 90 matching lines @@
       AddChunksCallback callback) = 0;
 
   // Delete chunks from the database.
   virtual void DeleteChunks(
       std::unique_ptr<std::vector<SBChunkDelete>> chunk_deletes) = 0;
 };
 
 }  // namespace safe_browsing
 
 #endif  // CHROME_BROWSER_SAFE_BROWSING_PROTOCOL_MANAGER_H_