Remove stl_util's STLDeleteContainerPairPointers.

chrome/browser/safe_browsing/client_side_detection_service_unittest.cc

 // 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.
 
 #include "chrome/browser/safe_browsing/client_side_detection_service.h"
 
 #include <stdint.h>
 
 #include <map>
 #include <memory>
 #include <queue>
 #include <string>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/logging.h"
 #include "base/macros.h"
+#include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/field_trial.h"
 #include "base/run_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/time/time.h"
 #include "chrome/common/safe_browsing/client_model.pb.h"
 #include "chrome/common/safe_browsing/csd.pb.h"
 #include "components/variations/variations_associated_data.h"
 #include "content/public/test/test_browser_thread.h"
 #include "crypto/sha2.h"
@@ skipping 119 matching lines @@
 
   std::queue<base::Time>& GetPhishingReportTimes() {
     return csd_service_->phishing_report_times_;
   }
 
   std::queue<base::Time>& GetMalwareReportTimes() {
     return csd_service_->malware_report_times_;
   }
 
   void SetCache(const GURL& gurl, bool is_phishing, base::Time time) {
-    csd_service_->cache_[gurl] =
-        make_linked_ptr(new ClientSideDetectionService::CacheState(is_phishing,
-                                                                   time));
+    csd_service_->cache_[gurl] = base::WrapUnique(

[mattm, 2016/08/16 20:41:22]

Use MakeUnique instead of WrapUnique? (see chromium-dev thread) (applies
elsewhere too)

[Avi (use Gerrit), 2016/08/17 18:25:37]

Sometimes MakeUnique works, sometimes it fails for access reasons or Create()
functions. I'm unfamiliar with a lot of this code, and sometimes I use
WrapUnique just because it's the most minimally-invasive way to do the
conversion.

[mattm, 2016/08/17 21:28:34]

nit: Could you update the other ones in here too?

[Avi (use Gerrit), 2016/08/17 21:34:55]

Done.

+        new ClientSideDetectionService::CacheState(is_phishing, time));
   }
 
   void TestCache() {
-    ClientSideDetectionService::PhishingCache& cache = csd_service_->cache_;
+    auto& cache = csd_service_->cache_;
     base::Time now = base::Time::Now();
     base::Time time =
         now - base::TimeDelta::FromDays(
             ClientSideDetectionService::kNegativeCacheIntervalDays) +
         base::TimeDelta::FromMinutes(5);
-    cache[GURL("http://first.url.com/")] =
-        make_linked_ptr(new ClientSideDetectionService::CacheState(false,
-                                                                   time));
+    cache[GURL("http://first.url.com/")] = base::WrapUnique(
+        new ClientSideDetectionService::CacheState(false, time));
 
     time =
         now - base::TimeDelta::FromDays(
             ClientSideDetectionService::kNegativeCacheIntervalDays) -
         base::TimeDelta::FromHours(1);
-    cache[GURL("http://second.url.com/")] =
-        make_linked_ptr(new ClientSideDetectionService::CacheState(false,
-                                                                   time));
+    cache[GURL("http://second.url.com/")] = base::WrapUnique(
+        new ClientSideDetectionService::CacheState(false, time));
 
     time =
         now - base::TimeDelta::FromMinutes(
             ClientSideDetectionService::kPositiveCacheIntervalMinutes) -
         base::TimeDelta::FromMinutes(5);
-    cache[GURL("http://third.url.com/")] =
-        make_linked_ptr(new ClientSideDetectionService::CacheState(true, time));
+    cache[GURL("http://third.url.com/")] = base::WrapUnique(
+        new ClientSideDetectionService::CacheState(true, time));
 
     time =
         now - base::TimeDelta::FromMinutes(
             ClientSideDetectionService::kPositiveCacheIntervalMinutes) +
         base::TimeDelta::FromMinutes(5);
-    cache[GURL("http://fourth.url.com/")] =
-        make_linked_ptr(new ClientSideDetectionService::CacheState(true, time));
+    cache[GURL("http://fourth.url.com/")] = base::WrapUnique(
+        new ClientSideDetectionService::CacheState(true, time));
 
     csd_service_->UpdateCache();
 
     // 3 elements should be in the cache, the first, third, and fourth.
     EXPECT_EQ(3U, cache.size());
     EXPECT_TRUE(cache.find(GURL("http://first.url.com/")) != cache.end());
     EXPECT_TRUE(cache.find(GURL("http://third.url.com/")) != cache.end());
     EXPECT_TRUE(cache.find(GURL("http://fourth.url.com/")) != cache.end());
 
     // While 3 elements remain, only the first and the fourth are actually
@@ skipping 278 matching lines @@
 
   // Check that disabling again doesn't request the model.
   csd_service_->SetEnabledAndRefreshState(false);
   // No calls expected.
   base::RunLoop().RunUntilIdle();
   Mock::VerifyAndClearExpectations(service);
   Mock::VerifyAndClearExpectations(loader_1);
   Mock::VerifyAndClearExpectations(loader_2);
 }
 }  // namespace safe_browsing