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

Unified Diff: chrome/browser/intranet_redirect_detector.h

Issue 2442953002: Remove stl_util's deletion function use from chrome/. (Closed)
Patch Set: fix Created 4 years, 2 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/intranet_redirect_detector.h
diff --git a/chrome/browser/intranet_redirect_detector.h b/chrome/browser/intranet_redirect_detector.h
index d491d50875d4a9f160fa1a917a9ed5d369a054b0..edffa3f756720fe70b48863c3d48273f6a65bfd1 100644
--- a/chrome/browser/intranet_redirect_detector.h
+++ b/chrome/browser/intranet_redirect_detector.h
@@ -5,7 +5,8 @@
#ifndef CHROME_BROWSER_INTRANET_REDIRECT_DETECTOR_H_
#define CHROME_BROWSER_INTRANET_REDIRECT_DETECTOR_H_
-#include <set>
+#include <map>
+#include <memory>
#include <string>
#include <vector>
@@ -56,8 +57,6 @@ class IntranetRedirectDetector
static void RegisterPrefs(PrefRegistrySimple* registry);
private:
- typedef std::set<net::URLFetcher*> Fetchers;
-
// Called when the seven second startup sleep or the one second network
// switch sleep has finished. Runs any pending fetch.
void FinishSleep();
@@ -69,7 +68,7 @@ class IntranetRedirectDetector
void OnIPAddressChanged() override;
GURL redirect_origin_;
- Fetchers fetchers_;
+ std::map<net::URLFetcher*, std::unique_ptr<net::URLFetcher>> fetchers_;
std::vector<GURL> resulting_origins_;
bool in_sleep_; // True if we're in the seven-second "no fetching" period
// that begins at browser start, or the one-second "no
« no previous file with comments | « chrome/browser/importer/ie_importer_browsertest_win.cc ('k') | chrome/browser/intranet_redirect_detector.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698