Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4971)

Unified Diff: chrome/browser/safe_browsing/protocol_manager.h

Issue 2293153002: Remove stl_util's STLDeleteContainerPairFirstPointers. (Closed)
Patch Set: fixing Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/safe_browsing/protocol_manager.h
diff --git a/chrome/browser/safe_browsing/protocol_manager.h b/chrome/browser/safe_browsing/protocol_manager.h
index d1f8f50f413d90d81ab7377e4636391410c970a4..d6e340b179a7865cbd1a49a378e4f2163a0d2e7c 100644
--- a/chrome/browser/safe_browsing/protocol_manager.h
+++ b/chrome/browser/safe_browsing/protocol_manager.h
@@ -15,6 +15,7 @@
#include <stddef.h>
+#include <algorithm>
#include <deque>
#include <memory>
#include <set>
@@ -290,7 +291,6 @@ class SafeBrowsingProtocolManager : public net::URLFetcherDelegate {
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.
@@ -334,7 +334,9 @@ class SafeBrowsingProtocolManager : public net::URLFetcherDelegate {
// 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.

Powered by Google App Engine
This is Rietveld 408576698