Remove stl_util's STLDeleteContainerPairSecondPointers from extensions.

extensions/browser/api/vpn_provider/vpn_service.h

 // Copyright 2014 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 EXTENSIONS_BROWSER_API_VPN_PROVIDER_VPN_SERVICE_H_
 #define EXTENSIONS_BROWSER_API_VPN_PROVIDER_VPN_SERVICE_H_
 
 #include <map>
 #include <memory>
 #include <string>
@@ skipping 155 matching lines @@
 
   // Creates a new VpnServiceProxy. The caller owns the returned value. It's
   // valid to return nullptr.
   std::unique_ptr<content::VpnServiceProxy> GetVpnServiceProxy();
 
  private:
   class VpnConfiguration;
   class VpnServiceProxyImpl;
 
   using StringToConfigurationMap = std::map<std::string, VpnConfiguration*>;
+  using StringToOwnedConfigurationMap =
+      std::map<std::string, std::unique_ptr<VpnConfiguration>>;
 
   // Callback used to indicate that configuration was successfully created.
   void OnCreateConfigurationSuccess(const SuccessCallback& callback,
                                     VpnConfiguration* configuration,
                                     const std::string& service_path,
                                     const std::string& guid);
 
   // Callback used to indicate that configuration creation failed.
   void OnCreateConfigurationFailure(
       const FailureCallback& callback,
@@ skipping 60 matching lines @@
 
   extensions::ExtensionRegistry* extension_registry_;
   extensions::EventRouter* event_router_;
   ShillThirdPartyVpnDriverClient* shill_client_;
   NetworkConfigurationHandler* network_configuration_handler_;
   NetworkProfileHandler* network_profile_handler_;
   NetworkStateHandler* network_state_handler_;
 
   VpnConfiguration* active_configuration_;
 
   // Key map owns the VpnConfigurations.

[Devlin, 2016/09/16 20:23:19]

This comment should be unnecessary now.

[Avi (use Gerrit), 2016/09/16 20:41:45]

Done.

-  StringToConfigurationMap key_to_configuration_map_;
+  StringToOwnedConfigurationMap key_to_configuration_map_;
 
   // Service path does not own the VpnConfigurations.
   StringToConfigurationMap service_path_to_configuration_map_;
 
   base::WeakPtrFactory<VpnService> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(VpnService);
 };
 
 }  // namespace chromeos
 
 #endif  // EXTENSIONS_BROWSER_API_VPN_PROVIDER_VPN_SERVICE_H_