Remove stl_util's STLDeleteContainerPairPointers.

chrome/browser/safe_browsing/client_side_detection_service.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.
 //
 // Helper class which handles communication with the SafeBrowsing backends for
 // client-side phishing detection.  This class is used to fetch the client-side
 // model and send it to all renderers.  This class is also used to send a ping
 // back to Google to verify if a particular site is really phishing or not.
 //
 // This class is not thread-safe and expects all calls to be made on the UI
 // thread.  We also expect that the calling thread runs a message loop.
 
 #ifndef CHROME_BROWSER_SAFE_BROWSING_CLIENT_SIDE_DETECTION_SERVICE_H_
 #define CHROME_BROWSER_SAFE_BROWSING_CLIENT_SIDE_DETECTION_SERVICE_H_
 
 #include <map>
 #include <memory>
 #include <queue>
 #include <set>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/callback_forward.h"
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
-#include "base/memory/linked_ptr.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/time/time.h"
 #include "chrome/browser/safe_browsing/client_side_model_loader.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "net/url_request/url_fetcher_delegate.h"
 #include "url/gurl.h"
 
@@ skipping 118 matching lines @@
                            SetEnabledAndRefreshState);
 
   // CacheState holds all information necessary to respond to a caller without
   // actually making a HTTP request.
   struct CacheState {
     bool is_phishing;
     base::Time timestamp;
 
     CacheState(bool phish, base::Time time);
   };
-  typedef std::map<GURL, linked_ptr<CacheState> > PhishingCache;
 
   static const char kClientReportMalwareUrl[];
   static const char kClientReportPhishingUrl[];
   static const int kMaxReportsPerInterval;
   static const int kInitialClientModelFetchDelayMs;
   static const int kReportsIntervalDays;
   static const int kNegativeCacheIntervalDays;
   static const int kPositiveCacheIntervalMinutes;
 
   // Starts sending the request to the client-side detection frontends.
@@ skipping 46 matching lines @@
   // it won't download the model nor report detected phishing URLs.
   bool enabled_;
 
   // We load two models: One for stadard Safe Browsing profiles,
   // and one for those opted into extended reporting.
   std::unique_ptr<ModelLoader> model_loader_standard_;
   std::unique_ptr<ModelLoader> model_loader_extended_;
 
   // Map of client report phishing request to the corresponding callback that
   // has to be invoked when the request is done.
-  struct ClientReportInfo;
-  std::map<const net::URLFetcher*, ClientReportInfo*>
+  struct ClientPhishingReportInfo;
+  std::map<const net::URLFetcher*, std::unique_ptr<ClientPhishingReportInfo>>
       client_phishing_reports_;
   // Map of client malware ip request to the corresponding callback that
   // has to be invoked when the request is done.
   struct ClientMalwareReportInfo;
-  std::map<const net::URLFetcher*, ClientMalwareReportInfo*>
+  std::map<const net::URLFetcher*, std::unique_ptr<ClientMalwareReportInfo>>
       client_malware_reports_;
 
   // Cache of completed requests. Used to satisfy requests for the same urls
   // as long as the next request falls within our caching window (which is
   // determined by kNegativeCacheInterval and kPositiveCacheInterval). The
   // size of this cache is limited by kMaxReportsPerDay *
   // ceil(InDays(max(kNegativeCacheInterval, kPositiveCacheInterval))).
   // TODO(gcasto): Serialize this so that it doesn't reset on browser restart.
-  PhishingCache cache_;
+  std::map<GURL, std::unique_ptr<CacheState>> cache_;
 
   // Timestamp of when we sent a phishing request. Used to limit the number
   // of phishing requests that we send in a day.
   // TODO(gcasto): Serialize this so that it doesn't reset on browser restart.
   std::queue<base::Time> phishing_report_times_;
 
   // Timestamp of when we sent a malware request. Used to limit the number
   // of malware requests that we send in a day.
   std::queue<base::Time> malware_report_times_;
 
   // The context we use to issue network requests.
   scoped_refptr<net::URLRequestContextGetter> request_context_getter_;
 
   content::NotificationRegistrar registrar_;
 
   // Used to asynchronously call the callbacks for
   // SendClientReportPhishingRequest.
   base::WeakPtrFactory<ClientSideDetectionService> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ClientSideDetectionService);
 };
 
 }  // namespace safe_browsing
 
 #endif  // CHROME_BROWSER_SAFE_BROWSING_CLIENT_SIDE_DETECTION_SERVICE_H_