Remove stl_util's deletion functions from net/proxy/.

net/proxy/proxy_config_service_win.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 "net/proxy/proxy_config_service_win.h"
 
 #include <windows.h>
 #include <winhttp.h>
 
 #include <memory>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/logging.h"
-#include "base/stl_util.h"
+#include "base/memory/ptr_util.h"
 #include "base/strings/string_tokenizer.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/win/registry.h"
 #include "base/win/scoped_handle.h"
 #include "net/base/net_errors.h"
 #include "net/proxy/proxy_config.h"
 
 namespace net {
@@ skipping 13 matching lines @@
 
 }  // namespace
 
 ProxyConfigServiceWin::ProxyConfigServiceWin()
     : PollingProxyConfigService(
           base::TimeDelta::FromSeconds(kPollIntervalSec),
           &ProxyConfigServiceWin::GetCurrentProxyConfig) {
 }
 
 ProxyConfigServiceWin::~ProxyConfigServiceWin() {
-  // The registry functions below will end up going to disk.  Do this on another
-  // thread to avoid slowing the IO thread.  http://crbug.com/61453
+  // The registry functions below will end up going to disk.  TODO: Do this on
+  // another thread to avoid slowing the IO thread.  http://crbug.com/61453
   base::ThreadRestrictions::ScopedAllowIO allow_io;
-  base::STLDeleteElements(&keys_to_watch_);
+  keys_to_watch_.clear();
 }
 
 void ProxyConfigServiceWin::AddObserver(Observer* observer) {
   // Lazily-initialize our registry watcher.
   StartWatchingRegistryForChanges();
 
   // Let the super-class do its work now.
   PollingProxyConfigService::AddObserver(observer);
 }
 
@@ skipping 26 matching lines @@
       L"Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings");
 
   AddKeyToWatchList(
       HKEY_LOCAL_MACHINE,
       L"SOFTWARE\\Policies\\Microsoft\\Windows\\CurrentVersion\\"
       L"Internet Settings");
 }
 
 bool ProxyConfigServiceWin::AddKeyToWatchList(HKEY rootkey,
                                               const wchar_t* subkey) {
-  std::unique_ptr<base::win::RegKey> key(new base::win::RegKey);
+  std::unique_ptr<base::win::RegKey> key =
+      base::MakeUnique<base::win::RegKey>();
   if (key->Create(rootkey, subkey, KEY_NOTIFY) != ERROR_SUCCESS)
     return false;
 
   if (!key->StartWatching(base::Bind(&ProxyConfigServiceWin::OnObjectSignaled,
                                      base::Unretained(this),
                                      base::Unretained(key.get())))) {
     return false;
   }
 
-  keys_to_watch_.push_back(key.release());
+  keys_to_watch_.push_back(std::move(key));
   return true;
 }
 
 void ProxyConfigServiceWin::OnObjectSignaled(base::win::RegKey* key) {
   // Figure out which registry key signalled this change.
-  RegKeyList::iterator it =
-      std::find(keys_to_watch_.begin(), keys_to_watch_.end(), key);
+  auto it = std::find_if(keys_to_watch_.begin(), keys_to_watch_.end(),
+                         [key](const std::unique_ptr<base::win::RegKey>& ptr) {
+                           return ptr.get() == key;
+                         });
   DCHECK(it != keys_to_watch_.end());
 
   // Keep watching the registry key.
   if (!key->StartWatching(base::Bind(&ProxyConfigServiceWin::OnObjectSignaled,
                                      base::Unretained(this),
                                      base::Unretained(key)))) {
-    delete *it;
     keys_to_watch_.erase(it);
   }
 
   // Have the PollingProxyConfigService test for changes.
   CheckForChangesNow();
 }
 
 // static
 void ProxyConfigServiceWin::GetCurrentProxyConfig(ProxyConfig* config) {
   WINHTTP_CURRENT_USER_IE_PROXY_CONFIG ie_config = {0};
@@ skipping 28 matching lines @@
       std::string bypass_url_domain = proxy_server_bypass_list.token();
       config->proxy_rules().bypass_rules.AddRuleFromString(bypass_url_domain);
     }
   }
   if (ie_config.lpszAutoConfigUrl)
     config->set_pac_url(GURL(ie_config.lpszAutoConfigUrl));
   config->set_source(PROXY_CONFIG_SOURCE_SYSTEM);
 }
 
 }  // namespace net