Remove stl_util's STLDeleteContainerPairSecondPointers.

chrome/browser/content_settings/local_shared_objects_container.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/content_settings/local_shared_objects_container.h"
 
 #include "base/memory/ptr_util.h"
 #include "chrome/browser/browsing_data/browsing_data_appcache_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_cache_storage_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_channel_id_helper.h"
@@ skipping 68 matching lines @@
   // means count all cookies that have been set by a host that is not considered
   // to be a third party regarding the domain of the provided |origin|. E.g. if
   // the origin is "http://foo.com" then all cookies with domain foo.com,
   // a.foo.com, b.a.foo.com or *.foo.com will be counted.
   typedef CannedBrowsingDataCookieHelper::OriginCookieSetMap OriginCookieSetMap;
   const OriginCookieSetMap& origin_cookies_set_map =
       cookies()->origin_cookie_set_map();
   for (OriginCookieSetMap::const_iterator it = origin_cookies_set_map.begin();
        it != origin_cookies_set_map.end();
        ++it) {
-    const canonical_cookie::CookieHashSet* cookie_list = it->second;
-    for (canonical_cookie::CookieHashSet::const_iterator cookie =
-             cookie_list->begin();
-         cookie != cookie_list->end();
+    const canonical_cookie::CookieHashSet* cookie_list = it->second.get();
+    for (auto cookie = cookie_list->begin(); cookie != cookie_list->end();

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

can this one be for-each?

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

Done.

          ++cookie) {
       // Strip leading '.'s.
       std::string cookie_domain = cookie->Domain();
       if (cookie_domain[0] == '.')
         cookie_domain = cookie_domain.substr(1);
       // The |domain_url| is only created in order to use the
       // SameDomainOrHost method below. It does not matter which scheme is
       // used as the scheme is ignored by the SameDomainOrHost method.
       GURL domain_url(std::string(url::kHttpScheme) +
                       url::kStandardSchemeSeparator + cookie_domain);
@@ skipping 116 matching lines @@
 
 std::unique_ptr<CookiesTreeModel>
 LocalSharedObjectsContainer::CreateCookiesTreeModel() const {
   LocalDataContainer* container = new LocalDataContainer(
       cookies(), databases(), local_storages(), session_storages(), appcaches(),
       indexed_dbs(), file_systems(), nullptr, channel_ids(), service_workers(),
       cache_storages(), nullptr);
 
   return base::MakeUnique<CookiesTreeModel>(container, nullptr);
 }