Remove stl_util's deletion function use from chrome/browser/extensions/api/content_settings.

chrome/browser/extensions/api/content_settings/content_settings_store.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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_API_CONTENT_SETTINGS_CONTENT_SETTINGS_STORE_H_
 #define CHROME_BROWSER_EXTENSIONS_API_CONTENT_SETTINGS_CONTENT_SETTINGS_STORE_H_
 
 #include <map>
+#include <memory>
 #include <string>
+#include <vector>
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/observer_list.h"
 #include "base/synchronization/lock.h"
 #include "base/threading/thread_checker.h"
 #include "base/time/time.h"
 #include "components/content_settings/core/browser/content_settings_provider.h"
 #include "components/content_settings/core/common/content_settings.h"
 #include "components/content_settings/core/common/content_settings_pattern.h"
@@ skipping 85 matching lines @@
   void AddObserver(Observer* observer);
 
   // Remove |observer|. This method should only be called on the UI thread.
   void RemoveObserver(Observer* observer);
 
  private:
   friend class base::RefCountedThreadSafe<ContentSettingsStore>;
 
   struct ExtensionEntry;
 
-  typedef std::multimap<base::Time, ExtensionEntry*> ExtensionEntryMap;
+  using ExtensionEntries = std::vector<std::unique_ptr<ExtensionEntry>>;
 
   virtual ~ContentSettingsStore();
 
   content_settings::OriginIdentifierValueMap* GetValueMap(
       const std::string& ext_id,
       ExtensionPrefsScope scope);
 
   const content_settings::OriginIdentifierValueMap* GetValueMap(
       const std::string& ext_id,
       ExtensionPrefsScope scope) const;
 
   void NotifyOfContentSettingChanged(const std::string& extension_id,
                                      bool incognito);
 
   bool OnCorrectThread();
 
-  ExtensionEntryMap::iterator FindEntry(const std::string& ext_id);
-  ExtensionEntryMap::const_iterator FindEntry(const std::string& ext_id) const;
+  ExtensionEntries::iterator FindEntry(const std::string& ext_id);
+  ExtensionEntries::const_iterator FindEntry(const std::string& ext_id) const;
 
-  ExtensionEntryMap entries_;
+  // The entries. Maintained in reverse-chronological order (newest items first)

[Devlin, 2016/12/14 15:54:01]

I wonder if the part about reverse-chronological order is more useful above the
using declaration?  Similar to how for we would suggest a comment above using x
= std::map<std::string, int> describing what the string and int are.

[Avi (use Gerrit), 2016/12/14 19:29:06]

Done.

+  // to facilitate search.
+  ExtensionEntries entries_;
 
   base::ObserverList<Observer, false> observers_;
 
   mutable base::Lock lock_;
 
   DISALLOW_COPY_AND_ASSIGN(ContentSettingsStore);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_API_CONTENT_SETTINGS_CONTENT_SETTINGS_STORE_H_