| Index: extensions/browser/api/vpn_provider/vpn_service.cc
|
| diff --git a/extensions/browser/api/vpn_provider/vpn_service.cc b/extensions/browser/api/vpn_provider/vpn_service.cc
|
| index ccc0fe2683ca71e8bb9d8ce103980fb584d405ac..2bd7f1e78c091d0c00df202d64c98798c84f4134 100644
|
| --- a/extensions/browser/api/vpn_provider/vpn_service.cc
|
| +++ b/extensions/browser/api/vpn_provider/vpn_service.cc
|
| @@ -243,8 +243,8 @@ VpnService::~VpnService() {
|
| network_configuration_handler_->RemoveObserver(this);
|
| network_state_handler_->RemoveObserver(this, FROM_HERE);
|
| extension_registry_->RemoveObserver(this);
|
| - STLDeleteContainerPairSecondPointers(key_to_configuration_map_.begin(),
|
| - key_to_configuration_map_.end());
|
| + base::STLDeleteContainerPairSecondPointers(key_to_configuration_map_.begin(),
|
| + key_to_configuration_map_.end());
|
| }
|
|
|
| void VpnService::SendShowAddDialogToExtension(const std::string& extension_id) {
|
| @@ -393,7 +393,7 @@ void VpnService::CreateConfiguration(const std::string& extension_id,
|
| }
|
|
|
| const std::string key = GetKey(extension_id, configuration_name);
|
| - if (ContainsKey(key_to_configuration_map_, key)) {
|
| + if (base::ContainsKey(key_to_configuration_map_, key)) {
|
| failure.Run(std::string(), std::string("Name not unique."));
|
| return;
|
| }
|
| @@ -443,7 +443,7 @@ void VpnService::DestroyConfiguration(const std::string& extension_id,
|
| const FailureCallback& failure) {
|
| // The ID is the configuration name for now. This may change in the future.
|
| const std::string key = GetKey(extension_id, configuration_id);
|
| - if (!ContainsKey(key_to_configuration_map_, key)) {
|
| + if (!base::ContainsKey(key_to_configuration_map_, key)) {
|
| failure.Run(std::string(), std::string("Unauthorized access."));
|
| return;
|
| }
|
| @@ -516,7 +516,7 @@ bool VpnService::VerifyConfigExistsForTesting(
|
| const std::string& extension_id,
|
| const std::string& configuration_name) {
|
| const std::string key = GetKey(extension_id, configuration_name);
|
| - return ContainsKey(key_to_configuration_map_, key);
|
| + return base::ContainsKey(key_to_configuration_map_, key);
|
| }
|
|
|
| bool VpnService::VerifyConfigIsConnectedForTesting(
|
| @@ -664,7 +664,7 @@ void VpnService::Bind(
|
| pepper_vpn_provider_proxy) {
|
| // The ID is the configuration name for now. This may change in the future.
|
| const std::string key = GetKey(extension_id, configuration_id);
|
| - if (!ContainsKey(key_to_configuration_map_, key)) {
|
| + if (!base::ContainsKey(key_to_configuration_map_, key)) {
|
| failure.Run(std::string(),
|
| std::string("Unauthorized access. "
|
| "The configuration does not exist."));
|
|
|