Remove stl_util's STLDeleteContainerPairSecondPointers.

chrome/browser/browsing_data/browsing_data_cookie_helper.cc

Index: chrome/browser/browsing_data/browsing_data_cookie_helper.cc
diff --git a/chrome/browser/browsing_data/browsing_data_cookie_helper.cc b/chrome/browser/browsing_data/browsing_data_cookie_helper.cc
index efebdf181ed6b159a0d3b6942e822c2002a71560..f76064234dcea68c83e27db06f99ed145e18d701 100644
--- a/chrome/browser/browsing_data/browsing_data_cookie_helper.cc
+++ b/chrome/browser/browsing_data/browsing_data_cookie_helper.cc
@@ -10,7 +10,7 @@
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/logging.h"
-#include "base/stl_util.h"
+#include "base/memory/ptr_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "content/public/browser/browser_thread.h"
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
@@ -109,8 +109,6 @@ void CannedBrowsingDataCookieHelper::AddChangedCookie(
 }
 
 void CannedBrowsingDataCookieHelper::Reset() {
-  base::STLDeleteContainerPairSecondPointers(origin_cookie_set_map_.begin(),
-                                             origin_cookie_set_map_.end());
   origin_cookie_set_map_.clear();
 }
 
@@ -145,7 +143,7 @@ void CannedBrowsingDataCookieHelper::StartFetching(
 void CannedBrowsingDataCookieHelper::DeleteCookie(
     const net::CanonicalCookie& cookie) {
   for (const auto& pair : origin_cookie_set_map_)
-    DeleteMatchingCookie(cookie, pair.second);
+    DeleteMatchingCookie(cookie, pair.second.get());
   BrowsingDataCookieHelper::DeleteCookie(cookie);
 }
 
@@ -157,17 +155,13 @@ bool CannedBrowsingDataCookieHelper::DeleteMatchingCookie(
 
 canonical_cookie::CookieHashSet* CannedBrowsingDataCookieHelper::GetCookiesFor(
     const GURL& first_party_origin) {
-  OriginCookieSetMap::iterator it =
-      origin_cookie_set_map_.find(first_party_origin);
-  if (it == origin_cookie_set_map_.end()) {
-    canonical_cookie::CookieHashSet* cookies =
-        new canonical_cookie::CookieHashSet;
-    origin_cookie_set_map_.insert(
-        std::pair<GURL, canonical_cookie::CookieHashSet*>(first_party_origin,
-                                                          cookies));
-    return cookies;
-  }
-  return it->second;
+  auto it = origin_cookie_set_map_.find(first_party_origin);
+  if (it != origin_cookie_set_map_.end())
+    return it->second.get();
+
+  origin_cookie_set_map_[first_party_origin] =
+      base::MakeUnique<canonical_cookie::CookieHashSet>();
+  return origin_cookie_set_map_[first_party_origin].get();

[Nico, 2016/09/22 15:56:11]

This walks the tree twice. Either use insert() as on the lhs, or

  return (origin_cookie_set_map_[first_party_origin] =
    ase::MakeUnique<canonical_cookie::CookieHashSet>()).get();

[Avi (use Gerrit), 2016/09/22 19:17:16]

I can't use insert, because Linux doesn't correctly handle it.

Rewriting. 

 }
 
 void CannedBrowsingDataCookieHelper::AddCookie(