Remove stl_util's STLDeleteContainerPairSecondPointers.

chrome/browser/browsing_data/browsing_data_cookie_helper.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/browsing_data/browsing_data_cookie_helper.h"
 
 #include <memory>
 #include <utility>
 
 #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"
 #include "net/cookies/canonical_cookie.h"
 #include "net/cookies/cookie_util.h"
 #include "net/cookies/parsed_cookie.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "url/gurl.h"
 
@@ skipping 78 matching lines @@
     const GURL& url,
     const std::string& cookie_line,
     const net::CookieOptions& options) {
   std::unique_ptr<net::CanonicalCookie> cookie(net::CanonicalCookie::Create(
       url, cookie_line, base::Time::Now(), options));
   if (cookie.get())
     AddCookie(frame_url, *cookie);
 }
 
 void CannedBrowsingDataCookieHelper::Reset() {
-  base::STLDeleteContainerPairSecondPointers(origin_cookie_set_map_.begin(),
-                                             origin_cookie_set_map_.end());
   origin_cookie_set_map_.clear();
 }
 
 bool CannedBrowsingDataCookieHelper::empty() const {
   for (const auto& pair : origin_cookie_set_map_) {
     if (!pair.second->empty())
       return false;
   }
   return true;
 }
@@ skipping 14 matching lines @@
   for (const auto& pair : origin_cookie_set_map_) {
     cookie_list.insert(cookie_list.begin(), pair.second->begin(),
                        pair.second->end());
   }
   callback.Run(cookie_list);
 }
 
 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);
 }
 
 bool CannedBrowsingDataCookieHelper::DeleteMatchingCookie(
     const net::CanonicalCookie& add_cookie,
     canonical_cookie::CookieHashSet* cookie_set) {
   return cookie_set->erase(add_cookie) > 0;
 }
 
 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(
     const GURL& frame_url,
     const net::CanonicalCookie& cookie) {
   // Storing cookies in separate cookie sets per frame origin makes the
   // GetCookieCount method count a cookie multiple times if it is stored in
   // multiple sets.
   // E.g. let "example.com" be redirected to "www.example.com". A cookie set
   // with the cookie string "A=B; Domain=.example.com" would be sent to both
   // hosts. This means it would be stored in the separate cookie sets for both
   // hosts ("example.com", "www.example.com"). The method GetCookieCount would
   // count this cookie twice. To prevent this, we us a single global cookie
   // set as a work-around to store all added cookies. Per frame URL cookie
   // sets are currently not used. In the future they will be used for
   // collecting cookies per origin in redirect chains.
   // TODO(markusheintz): A) Change the GetCookiesCount method to prevent
   // counting cookies multiple times if they are stored in multiple cookie
   // sets.  B) Replace the GetCookieFor method call below with:
   // "GetCookiesFor(frame_url.GetOrigin());"
   CR_DEFINE_STATIC_LOCAL(const GURL, origin_cookie_url, (kGlobalCookieSetURL));
   canonical_cookie::CookieHashSet* cookie_set =
       GetCookiesFor(origin_cookie_url);
   DeleteMatchingCookie(cookie, cookie_set);
   cookie_set->insert(cookie);
 }