Remove stl_util's deletion functions from chromeos/.

chromeos/settings/timezone_settings.cc

 // Copyright 2013 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 "chromeos/settings/timezone_settings.h"
 
 #include <stddef.h>
 
 #include <memory>
 #include <string>
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/macros.h"
+#include "base/memory/ptr_util.h"
 #include "base/memory/singleton.h"
 #include "base/observer_list.h"
-#include "base/stl_util.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/sys_info.h"
 #include "base/task_runner.h"
 #include "base/threading/worker_pool.h"
 #include "chromeos/settings/timezone_settings_helper.h"
 
 namespace chromeos {
 namespace system {
 const char kUTCTimezoneName[] = "Etc/GMT";
@@ skipping 241 matching lines @@
 class TimezoneSettingsBaseImpl : public chromeos::system::TimezoneSettings {
  public:
   ~TimezoneSettingsBaseImpl() override;
 
   // TimezoneSettings implementation:
   const icu::TimeZone& GetTimezone() override;
   base::string16 GetCurrentTimezoneID() override;
   void SetTimezoneFromID(const base::string16& timezone_id) override;
   void AddObserver(Observer* observer) override;
   void RemoveObserver(Observer* observer) override;
-  const std::vector<icu::TimeZone*>& GetTimezoneList() const override;
+  const std::vector<std::unique_ptr<icu::TimeZone>>& GetTimezoneList()
+      const override;
 
  protected:
   TimezoneSettingsBaseImpl();
 
   // Returns |timezone| if it is an element of |timezones_|.
   // Otherwise, returns a timezone from |timezones_|, if such exists, that has
   // the same rule as the given |timezone|.
   // Otherwise, returns NULL.
   // Note multiple timezones with the same time zone rules may exist
   // e.g.
   //   US/Pacific == America/Los_Angeles
   const icu::TimeZone* GetKnownTimezoneOrNull(
       const icu::TimeZone& timezone) const;
 
   base::ObserverList<Observer> observers_;
-  std::vector<icu::TimeZone*> timezones_;
+  std::vector<std::unique_ptr<icu::TimeZone>> timezones_;
   std::unique_ptr<icu::TimeZone> timezone_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TimezoneSettingsBaseImpl);
 };
 
 // The TimezoneSettings implementation used in production.
 class TimezoneSettingsImpl : public TimezoneSettingsBaseImpl {
  public:
   // TimezoneSettings implementation:
@@ skipping 19 matching lines @@
 
  private:
   friend struct base::DefaultSingletonTraits<TimezoneSettingsStubImpl>;
 
   TimezoneSettingsStubImpl();
 
   DISALLOW_COPY_AND_ASSIGN(TimezoneSettingsStubImpl);
 };
 
 TimezoneSettingsBaseImpl::~TimezoneSettingsBaseImpl() {
-  base::STLDeleteElements(&timezones_);
 }
 
 const icu::TimeZone& TimezoneSettingsBaseImpl::GetTimezone() {
   return *timezone_.get();
 }
 
 base::string16 TimezoneSettingsBaseImpl::GetCurrentTimezoneID() {
   return chromeos::system::TimezoneSettings::GetTimezoneID(GetTimezone());
 }
 
 void TimezoneSettingsBaseImpl::SetTimezoneFromID(
     const base::string16& timezone_id) {
   std::unique_ptr<icu::TimeZone> timezone(icu::TimeZone::createTimeZone(
       icu::UnicodeString(timezone_id.c_str(), timezone_id.size())));
   SetTimezone(*timezone);
 }
 
 void TimezoneSettingsBaseImpl::AddObserver(Observer* observer) {
   observers_.AddObserver(observer);
 }
 
 void TimezoneSettingsBaseImpl::RemoveObserver(Observer* observer) {
   observers_.RemoveObserver(observer);
 }
 
-const std::vector<icu::TimeZone*>&
+const std::vector<std::unique_ptr<icu::TimeZone>>&
 TimezoneSettingsBaseImpl::GetTimezoneList() const {
   return timezones_;
 }
 
 TimezoneSettingsBaseImpl::TimezoneSettingsBaseImpl() {
   for (size_t i = 0; i < arraysize(kTimeZones); ++i) {
-    timezones_.push_back(icu::TimeZone::createTimeZone(
-        icu::UnicodeString(kTimeZones[i], -1, US_INV)));
+    timezones_.push_back(base::WrapUnique(icu::TimeZone::createTimeZone(
+        icu::UnicodeString(kTimeZones[i], -1, US_INV))));
   }
 }
 
 const icu::TimeZone* TimezoneSettingsBaseImpl::GetKnownTimezoneOrNull(
     const icu::TimeZone& timezone) const {
   return chromeos::system::GetKnownTimezoneOrNull(timezone, timezones_);
 }
 
 void TimezoneSettingsImpl::SetTimezone(const icu::TimeZone& timezone) {
   // Replace |timezone| by a known timezone with the same rules. If none exists
@@ skipping 92 matching lines @@
 
 // static
 base::string16 TimezoneSettings::GetTimezoneID(const icu::TimeZone& timezone) {
   icu::UnicodeString id;
   timezone.getID(id);
   return base::string16(id.getBuffer(), id.length());
 }
 
 }  // namespace system
 }  // namespace chromeos