[base] Replace Contains{Key,Value} with Contains in //extensions
This change replaces usages of base::ContainsKey() and base::ContainsValue()
with base::Contains() in //extensions.
Reproduction:
- sed -i 's/\bbase::ContainsKey\b/base::Contains/g'
- sed -i 's/\bbase::ContainsValue\b/base::Contains/g'
- git cl format
This CL was uploaded by git cl split.
[email protected], [email protected]
Bug: 970209
Change-Id: Ieb98ed38010683964cf62feae5da77e3e5c3a946
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1648188
Auto-Submit: Jan Wilken Dörrie <[email protected]>
Reviewed-by: Istiaque Ahmed <[email protected]>
Commit-Queue: Jan Wilken Dörrie <[email protected]>
Cr-Commit-Position: refs/heads/master@{#667068}
diff --git a/extensions/browser/api/audio/audio_service_chromeos.cc b/extensions/browser/api/audio/audio_service_chromeos.cc
index c35e1cb..1128ab2 100644
--- a/extensions/browser/api/audio/audio_service_chromeos.cc
+++ b/extensions/browser/api/audio/audio_service_chromeos.cc
@@ -200,10 +200,10 @@
bool accept_input =
!(filter && filter->stream_types) ||
- base::ContainsValue(*filter->stream_types, api::audio::STREAM_TYPE_INPUT);
- bool accept_output = !(filter && filter->stream_types) ||
- base::ContainsValue(*filter->stream_types,
- api::audio::STREAM_TYPE_OUTPUT);
+ base::Contains(*filter->stream_types, api::audio::STREAM_TYPE_INPUT);
+ bool accept_output =
+ !(filter && filter->stream_types) ||
+ base::Contains(*filter->stream_types, api::audio::STREAM_TYPE_OUTPUT);
for (const auto& device : devices) {
if (filter && filter->is_active && *filter->is_active != device.active)
diff --git a/extensions/browser/api/bluetooth/bluetooth_event_router.cc b/extensions/browser/api/bluetooth/bluetooth_event_router.cc
index 27dec00..35bfd60 100644
--- a/extensions/browser/api/bluetooth/bluetooth_event_router.cc
+++ b/extensions/browser/api/bluetooth/bluetooth_event_router.cc
@@ -208,7 +208,7 @@
BluetoothApiPairingDelegate* BluetoothEventRouter::GetPairingDelegate(
const std::string& extension_id) {
- return base::ContainsKey(pairing_delegate_map_, extension_id)
+ return base::Contains(pairing_delegate_map_, extension_id)
? pairing_delegate_map_[extension_id]
: nullptr;
}
@@ -250,7 +250,7 @@
LOG(ERROR) << "Unable to get adapter for extension_id: " << extension_id;
return;
}
- if (base::ContainsKey(pairing_delegate_map_, extension_id)) {
+ if (base::Contains(pairing_delegate_map_, extension_id)) {
// For WebUI there may be more than one page open to the same url
// (e.g. chrome://settings). These will share the same pairing delegate.
BLUETOOTH_LOG(EVENT) << "Pairing delegate already exists for extension_id: "
@@ -267,7 +267,7 @@
void BluetoothEventRouter::RemovePairingDelegate(
const std::string& extension_id) {
- if (base::ContainsKey(pairing_delegate_map_, extension_id)) {
+ if (base::Contains(pairing_delegate_map_, extension_id)) {
BluetoothApiPairingDelegate* delegate = pairing_delegate_map_[extension_id];
if (adapter_.get())
adapter_->RemovePairingDelegate(delegate);
diff --git a/extensions/browser/api/declarative/declarative_rule_unittest.cc b/extensions/browser/api/declarative/declarative_rule_unittest.cc
index 87f7195..3d36fd7d 100644
--- a/extensions/browser/api/declarative/declarative_rule_unittest.cc
+++ b/extensions/browser/api/declarative/declarative_rule_unittest.cc
@@ -119,7 +119,7 @@
bool IsFulfilled(const MatchData& match_data) const {
if (condition_set_id != -1 &&
- !base::ContainsKey(match_data.url_matches, condition_set_id))
+ !base::Contains(match_data.url_matches, condition_set_id))
return false;
return match_data.value <= max_value;
}
diff --git a/extensions/browser/api/declarative/deduping_factory.h b/extensions/browser/api/declarative/deduping_factory.h
index 542d8b1..cb96e0f 100644
--- a/extensions/browser/api/declarative/deduping_factory.h
+++ b/extensions/browser/api/declarative/deduping_factory.h
@@ -107,7 +107,7 @@
const std::string& instance_type,
typename DedupingFactory<BaseClassT>::Parameterized parameterized,
FactoryMethod factory_method) {
- DCHECK(!base::ContainsKey(factory_methods_, instance_type));
+ DCHECK(!base::Contains(factory_methods_, instance_type));
factory_methods_[instance_type] = factory_method;
if (parameterized == IS_PARAMETERIZED)
parameterized_types_.insert(instance_type);
@@ -134,7 +134,7 @@
// We can take a shortcut for objects that are not parameterized. For those
// only a single instance may ever exist so we can simplify the creation
// logic.
- if (!base::ContainsKey(parameterized_types_, instance_type)) {
+ if (!base::Contains(parameterized_types_, instance_type)) {
if (prototypes.empty()) {
scoped_refptr<const BaseClassT> new_object =
(*factory_method)(instance_type, value, error, bad_message);
diff --git a/extensions/browser/api/declarative/rules_registry.cc b/extensions/browser/api/declarative/rules_registry.cc
index 8b8367b..b85a68c 100644
--- a/extensions/browser/api/declarative/rules_registry.cc
+++ b/extensions/browser/api/declarative/rules_registry.cc
@@ -344,7 +344,7 @@
void RulesRegistry::ProcessChangedRules(const std::string& extension_id) {
DCHECK_CURRENTLY_ON(owner_thread());
- DCHECK(base::ContainsKey(process_changed_rules_requested_, extension_id));
+ DCHECK(base::Contains(process_changed_rules_requested_, extension_id));
process_changed_rules_requested_[extension_id] = NOT_SCHEDULED_FOR_PROCESSING;
std::vector<const api::events::Rule*> new_rules;
diff --git a/extensions/browser/api/declarative_net_request/file_sequence_helper.cc b/extensions/browser/api/declarative_net_request/file_sequence_helper.cc
index aa55d5e3..5475c9e 100644
--- a/extensions/browser/api/declarative_net_request/file_sequence_helper.cc
+++ b/extensions/browser/api/declarative_net_request/file_sequence_helper.cc
@@ -144,7 +144,7 @@
std::vector<dnr_api::Rule> result = std::move(current_rules);
base::EraseIf(result, [&ids_to_remove](const dnr_api::Rule& rule) {
- return base::ContainsKey(ids_to_remove, rule.id);
+ return base::Contains(ids_to_remove, rule.id);
});
return result;
diff --git a/extensions/browser/api/declarative_webrequest/webrequest_condition.cc b/extensions/browser/api/declarative_webrequest/webrequest_condition.cc
index 0b589d6..ce6e4819 100644
--- a/extensions/browser/api/declarative_webrequest/webrequest_condition.cc
+++ b/extensions/browser/api/declarative_webrequest/webrequest_condition.cc
@@ -98,12 +98,12 @@
// Check URL attributes if present.
if (url_matcher_conditions_.get() &&
- !base::ContainsKey(request_data.url_match_ids,
- url_matcher_conditions_->id()))
+ !base::Contains(request_data.url_match_ids,
+ url_matcher_conditions_->id()))
return false;
if (first_party_url_matcher_conditions_.get() &&
- !base::ContainsKey(request_data.first_party_url_match_ids,
- first_party_url_matcher_conditions_->id()))
+ !base::Contains(request_data.first_party_url_match_ids,
+ first_party_url_matcher_conditions_->id()))
return false;
// All condition attributes must be fulfilled for a fulfilled condition.
diff --git a/extensions/browser/api/declarative_webrequest/webrequest_condition_attribute.cc b/extensions/browser/api/declarative_webrequest/webrequest_condition_attribute.cc
index 0f263fa..77b6059 100644
--- a/extensions/browser/api/declarative_webrequest/webrequest_condition_attribute.cc
+++ b/extensions/browser/api/declarative_webrequest/webrequest_condition_attribute.cc
@@ -183,7 +183,7 @@
const WebRequestData& request_data) const {
if (!(request_data.stage & GetStages()))
return false;
- return base::ContainsValue(types_, request_data.request->web_request_type);
+ return base::Contains(types_, request_data.request->web_request_type);
}
WebRequestConditionAttribute::Type
@@ -266,9 +266,9 @@
content_type, &mime_type, &charset, &had_charset, NULL);
if (inclusive_) {
- return base::ContainsValue(content_types_, mime_type);
+ return base::Contains(content_types_, mime_type);
} else {
- return !base::ContainsValue(content_types_, mime_type);
+ return !base::Contains(content_types_, mime_type);
}
}
diff --git a/extensions/browser/api/declarative_webrequest/webrequest_rules_registry.cc b/extensions/browser/api/declarative_webrequest/webrequest_rules_registry.cc
index 211d168b..bb551be 100644
--- a/extensions/browser/api/declarative_webrequest/webrequest_rules_registry.cc
+++ b/extensions/browser/api/declarative_webrequest/webrequest_rules_registry.cc
@@ -129,7 +129,7 @@
if (!rule->tags().empty() && !ignore_tags[extension_id].empty()) {
bool ignore_rule = false;
for (const std::string& tag : rule->tags())
- ignore_rule |= base::ContainsKey(ignore_tags[extension_id], tag);
+ ignore_rule |= base::Contains(ignore_tags[extension_id], tag);
if (ignore_rule)
continue;
}
@@ -367,7 +367,7 @@
for (const auto& url_match : url_matches) {
auto rule_trigger = rule_triggers_.find(url_match);
CHECK(rule_trigger != rule_triggers_.end());
- if (!base::ContainsKey(*result, rule_trigger->second) &&
+ if (!base::Contains(*result, rule_trigger->second) &&
rule_trigger->second->conditions().IsFulfilled(url_match, request_data))
result->insert(rule_trigger->second);
}
diff --git a/extensions/browser/api/document_scan/document_scan_api.cc b/extensions/browser/api/document_scan/document_scan_api.cc
index 3681514..d11321dc 100644
--- a/extensions/browser/api/document_scan/document_scan_api.cc
+++ b/extensions/browser/api/document_scan/document_scan_api.cc
@@ -48,7 +48,7 @@
if (params_->options.mime_types) {
std::vector<std::string>& mime_types = *params_->options.mime_types;
for (; scanner_i != scanner_descriptions.end(); ++scanner_i) {
- if (base::ContainsValue(mime_types, scanner_i->image_mime_type)) {
+ if (base::Contains(mime_types, scanner_i->image_mime_type)) {
break;
}
}
diff --git a/extensions/browser/api/file_system/file_system_api.cc b/extensions/browser/api/file_system/file_system_api.cc
index 1ce53a3..176fedf 100644
--- a/extensions/browser/api/file_system/file_system_api.cc
+++ b/extensions/browser/api/file_system/file_system_api.cc
@@ -636,8 +636,7 @@
// If we still need to find suggested_extension, hunt for it inside the
// extensions returned from GetFileTypesFromAcceptOption.
- if (need_suggestion &&
- base::ContainsValue(extensions, suggested_extension)) {
+ if (need_suggestion && base::Contains(extensions, suggested_extension)) {
need_suggestion = false;
}
}
diff --git a/extensions/browser/api/hid/hid_device_manager.cc b/extensions/browser/api/hid/hid_device_manager.cc
index a6d7c12..672d07c 100644
--- a/extensions/browser/api/hid/hid_device_manager.cc
+++ b/extensions/browser/api/hid/hid_device_manager.cc
@@ -227,7 +227,7 @@
DCHECK(thread_checker_.CalledOnValidThread());
DCHECK_LT(next_resource_id_, std::numeric_limits<int>::max());
int new_id = next_resource_id_++;
- DCHECK(!base::ContainsKey(resource_ids_, device->guid));
+ DCHECK(!base::Contains(resource_ids_, device->guid));
resource_ids_[device->guid] = new_id;
devices_[new_id] = std::move(device);
diff --git a/extensions/browser/api/lock_screen_data/lock_screen_item_storage_unittest.cc b/extensions/browser/api/lock_screen_data/lock_screen_item_storage_unittest.cc
index f36bdce8..8417f22 100644
--- a/extensions/browser/api/lock_screen_data/lock_screen_item_storage_unittest.cc
+++ b/extensions/browser/api/lock_screen_data/lock_screen_item_storage_unittest.cc
@@ -704,7 +704,7 @@
allowed_paths.push_back(
test_dir_.GetPath().AppendASCII("deprecated_value_store"));
}
- EXPECT_TRUE(base::ContainsValue(allowed_paths, root))
+ EXPECT_TRUE(base::Contains(allowed_paths, root))
<< "Unexpected value store path " << root.value();
return std::make_unique<LocalValueStoreCache>(
@@ -1328,13 +1328,13 @@
EXPECT_TRUE(new_item);
EXPECT_EQ(2u, items.size());
- EXPECT_TRUE(base::ContainsValue(items, migrated_item_id));
- EXPECT_TRUE(base::ContainsValue(items, initial_item_id));
+ EXPECT_TRUE(base::Contains(items, migrated_item_id));
+ EXPECT_TRUE(base::Contains(items, initial_item_id));
GetAllItems(&items);
ASSERT_EQ(2u, items.size());
- EXPECT_TRUE(base::ContainsValue(items, migrated_item_id));
- EXPECT_TRUE(base::ContainsValue(items, new_item->id()));
+ EXPECT_TRUE(base::Contains(items, migrated_item_id));
+ EXPECT_TRUE(base::Contains(items, new_item->id()));
}
TEST_F(LockScreenItemStorageTest,
diff --git a/extensions/browser/api/management/management_api.cc b/extensions/browser/api/management/management_api.cc
index e028420..0ff0806 100644
--- a/extensions/browser/api/management/management_api.cc
+++ b/extensions/browser/api/management/management_api.cc
@@ -733,7 +733,7 @@
GetAvailableLaunchTypes(*extension, delegate);
management::LaunchType app_launch_type = params->launch_type;
- if (!base::ContainsValue(available_launch_types, app_launch_type)) {
+ if (!base::Contains(available_launch_types, app_launch_type)) {
return RespondNow(Error(keys::kLaunchTypeNotAvailableError));
}
diff --git a/extensions/browser/api/messaging/message_service.cc b/extensions/browser/api/messaging/message_service.cc
index 2793ff0..fdcf326e4 100644
--- a/extensions/browser/api/messaging/message_service.cc
+++ b/extensions/browser/api/messaging/message_service.cc
@@ -735,7 +735,7 @@
PendingMessage(source_port_id, message));
// A channel should only be holding pending messages because it is in one
// of these states.
- DCHECK(!base::ContainsKey(pending_lazy_context_channels_, channel_id));
+ DCHECK(!base::Contains(pending_lazy_context_channels_, channel_id));
return;
}
EnqueuePendingMessageForLazyBackgroundLoad(source_port_id,
diff --git a/extensions/browser/api/networking_private/networking_private_chromeos.cc b/extensions/browser/api/networking_private/networking_private_chromeos.cc
index 9b89e85..a3f08646 100644
--- a/extensions/browser/api/networking_private/networking_private_chromeos.cc
+++ b/extensions/browser/api/networking_private/networking_private_chromeos.cc
@@ -682,7 +682,7 @@
::onc::network_type::kEthernet, ::onc::network_type::kWiFi,
::onc::network_type::kWimax, ::onc::network_type::kCellular};
for (const char* technology : technology_types) {
- if (base::ContainsKey(technologies_found, technology))
+ if (base::Contains(technologies_found, technology))
continue;
AppendDeviceState(technology, nullptr /* device */,
device_state_list.get());
diff --git a/extensions/browser/api/socket/udp_socket.cc b/extensions/browser/api/socket/udp_socket.cc
index eedd1713..7d63bee 100644
--- a/extensions/browser/api/socket/udp_socket.cc
+++ b/extensions/browser/api/socket/udp_socket.cc
@@ -323,7 +323,7 @@
}
std::string normalized_address = ip.ToString();
- if (base::ContainsValue(multicast_groups_, normalized_address)) {
+ if (base::Contains(multicast_groups_, normalized_address)) {
std::move(callback).Run(net::ERR_ADDRESS_INVALID);
return;
}
diff --git a/extensions/browser/api/storage/storage_api_unittest.cc b/extensions/browser/api/storage/storage_api_unittest.cc
index 2e056eb8b..561e1b4f 100644
--- a/extensions/browser/api/storage/storage_api_unittest.cc
+++ b/extensions/browser/api/storage/storage_api_unittest.cc
@@ -140,10 +140,10 @@
RunSetFunction("key", "value");
EXPECT_EQ(2u, event_observer.events().size());
- EXPECT_TRUE(base::ContainsKey(event_observer.events(),
- api::storage::OnChanged::kEventName));
+ EXPECT_TRUE(base::Contains(event_observer.events(),
+ api::storage::OnChanged::kEventName));
EXPECT_TRUE(
- base::ContainsKey(event_observer.events(), "storage.local.onChanged"));
+ base::Contains(event_observer.events(), "storage.local.onChanged"));
}
} // namespace extensions
diff --git a/extensions/browser/api/system_display/system_display_apitest.cc b/extensions/browser/api/system_display/system_display_apitest.cc
index 446a499..a42934f 100644
--- a/extensions/browser/api/system_display/system_display_apitest.cc
+++ b/extensions/browser/api/system_display/system_display_apitest.cc
@@ -103,7 +103,7 @@
}
bool OverscanCalibrationStart(const std::string& id) override {
- if (base::ContainsKey(overscan_started_, id))
+ if (base::Contains(overscan_started_, id))
return false;
overscan_started_.insert(id);
return true;
@@ -112,21 +112,21 @@
bool OverscanCalibrationAdjust(
const std::string& id,
const api::system_display::Insets& delta) override {
- if (!base::ContainsKey(overscan_started_, id))
+ if (!base::Contains(overscan_started_, id))
return false;
overscan_adjusted_.insert(id);
return true;
}
bool OverscanCalibrationReset(const std::string& id) override {
- if (!base::ContainsKey(overscan_started_, id))
+ if (!base::Contains(overscan_started_, id))
return false;
overscan_adjusted_.erase(id);
return true;
}
bool OverscanCalibrationComplete(const std::string& id) override {
- if (!base::ContainsKey(overscan_started_, id))
+ if (!base::Contains(overscan_started_, id))
return false;
overscan_started_.erase(id);
return true;
@@ -141,11 +141,11 @@
bool unified_desktop_enabled() const { return unified_desktop_enabled_; }
bool calibration_started(const std::string& id) const {
- return base::ContainsKey(overscan_started_, id);
+ return base::Contains(overscan_started_, id);
}
bool calibration_changed(const std::string& id) const {
- return base::ContainsKey(overscan_adjusted_, id);
+ return base::Contains(overscan_adjusted_, id);
}
const api::system_display::MirrorMode& mirror_mode() const {
diff --git a/extensions/browser/api/usb/usb_device_manager.cc b/extensions/browser/api/usb/usb_device_manager.cc
index 8a9112b..e65d7c8 100644
--- a/extensions/browser/api/usb/usb_device_manager.cc
+++ b/extensions/browser/api/usb/usb_device_manager.cc
@@ -225,7 +225,7 @@
device::mojom::UsbDeviceInfoPtr device_info) {
DCHECK(device_info);
// Update the device list.
- DCHECK(!base::ContainsKey(devices_, device_info->guid));
+ DCHECK(!base::Contains(devices_, device_info->guid));
std::string guid = device_info->guid;
auto result =
devices_.insert(std::make_pair(std::move(guid), std::move(device_info)));
@@ -242,7 +242,7 @@
device::mojom::UsbDeviceInfoPtr device_info) {
DCHECK(device_info);
// Update the device list.
- DCHECK(base::ContainsKey(devices_, device_info->guid));
+ DCHECK(base::Contains(devices_, device_info->guid));
devices_.erase(device_info->guid);
DispatchEvent(usb::OnDeviceRemoved::kEventName, *device_info);
diff --git a/extensions/browser/api/vpn_provider/vpn_service.cc b/extensions/browser/api/vpn_provider/vpn_service.cc
index 722dfd40..d868923 100644
--- a/extensions/browser/api/vpn_provider/vpn_service.cc
+++ b/extensions/browser/api/vpn_provider/vpn_service.cc
@@ -368,7 +368,7 @@
}
const std::string key = GetKey(extension_id, configuration_name);
- if (base::ContainsKey(key_to_configuration_map_, key)) {
+ if (base::Contains(key_to_configuration_map_, key)) {
failure.Run(std::string(), std::string("Name not unique."));
return;
}
@@ -414,7 +414,7 @@
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 (!base::ContainsKey(key_to_configuration_map_, key)) {
+ if (!base::Contains(key_to_configuration_map_, key)) {
failure.Run(std::string(), std::string("Unauthorized access."));
return;
}
@@ -487,7 +487,7 @@
const std::string& extension_id,
const std::string& configuration_name) {
const std::string key = GetKey(extension_id, configuration_name);
- return base::ContainsKey(key_to_configuration_map_, key);
+ return base::Contains(key_to_configuration_map_, key);
}
bool VpnService::VerifyConfigIsConnectedForTesting(
@@ -635,7 +635,7 @@
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 (!base::ContainsKey(key_to_configuration_map_, key)) {
+ if (!base::Contains(key_to_configuration_map_, key)) {
failure.Run(std::string(),
std::string("Unauthorized access. "
"The configuration does not exist."));
diff --git a/extensions/browser/api/web_request/web_request_api.cc b/extensions/browser/api/web_request/web_request_api.cc
index 91b9768..e915e9fa 100644
--- a/extensions/browser/api/web_request/web_request_api.cc
+++ b/extensions/browser/api/web_request/web_request_api.cc
@@ -1963,7 +1963,7 @@
bool ExtensionWebRequestEventRouter::HasAnyExtraHeadersListenerImpl(
void* browser_context) {
- return base::ContainsKey(extra_headers_listener_count_, browser_context);
+ return base::Contains(extra_headers_listener_count_, browser_context);
}
void ExtensionWebRequestEventRouter::UpdateExtraHeadersListenerOnUI(
@@ -2070,8 +2070,7 @@
}
const std::vector<WebRequestResourceType>& types = listener->filter.types;
- if (!types.empty() &&
- !base::ContainsValue(types, request->web_request_type)) {
+ if (!types.empty() && !base::Contains(types, request->web_request_type)) {
continue;
}
@@ -2337,7 +2336,7 @@
Listeners& listeners = listeners_[browser_context][event_name];
for (const auto& listener : listeners) {
- if (!base::ContainsKey(listener->blocked_requests, request_id))
+ if (!base::Contains(listener->blocked_requests, request_id))
continue;
std::string delegate_info = l10n_util::GetStringFUTF8(
IDS_LOAD_STATE_PARAMETER_EXTENSION,
diff --git a/extensions/browser/api/web_request/web_request_api_helpers.cc b/extensions/browser/api/web_request/web_request_api_helpers.cc
index 5b53610..1ea4fff2 100644
--- a/extensions/browser/api/web_request/web_request_api_helpers.cc
+++ b/extensions/browser/api/web_request/web_request_api_helpers.cc
@@ -949,7 +949,7 @@
const std::string& value = modification.value();
// We must not modify anything that has been deleted before.
- if (base::ContainsKey(*removed_headers, key)) {
+ if (base::Contains(*removed_headers, key)) {
extension_conflicts = true;
break;
}
@@ -970,7 +970,7 @@
// We must not modify anything that has been set to a *different*
// value before.
- if (base::ContainsKey(*set_headers, key)) {
+ if (base::Contains(*set_headers, key)) {
std::string current_value;
if (!request_headers->GetHeader(key, ¤t_value) ||
current_value != value) {
@@ -985,7 +985,7 @@
// modified before.
{
for (const std::string& key : delta.deleted_request_headers) {
- if (base::ContainsKey(*set_headers, base::ToLowerASCII(key))) {
+ if (base::Contains(*set_headers, base::ToLowerASCII(key))) {
extension_conflicts = true;
break;
}
@@ -1002,7 +1002,7 @@
std::string key = base::ToLowerASCII(modification.name());
if (!request_headers->HasHeader(key)) {
added_headers.insert(key);
- } else if (!base::ContainsKey(added_headers, key)) {
+ } else if (!base::Contains(added_headers, key)) {
// Note: |key| will only be present in |added_headers| if this is an
// identical edit.
overridden_headers.insert(key);
diff --git a/extensions/browser/app_window/app_window_geometry_cache.cc b/extensions/browser/app_window/app_window_geometry_cache.cc
index a17057e..57db19c9 100644
--- a/extensions/browser/app_window/app_window_geometry_cache.cc
+++ b/extensions/browser/app_window/app_window_geometry_cache.cc
@@ -56,7 +56,7 @@
if (extension_data[window_id].bounds == bounds &&
extension_data[window_id].window_state == window_state &&
extension_data[window_id].screen_bounds == screen_bounds &&
- !base::ContainsKey(unsynced_extensions_, extension_id))
+ !base::Contains(unsynced_extensions_, extension_id))
return;
base::Time now = base::Time::Now();
diff --git a/extensions/browser/app_window/app_window_registry.cc b/extensions/browser/app_window/app_window_registry.cc
index 4a59d05..cc11d60 100644
--- a/extensions/browser/app_window/app_window_registry.cc
+++ b/extensions/browser/app_window/app_window_registry.cc
@@ -182,7 +182,7 @@
}
void AppWindowRegistry::AddAppWindowToList(AppWindow* app_window) {
- if (base::ContainsValue(app_windows_, app_window))
+ if (base::Contains(app_windows_, app_window))
return;
app_windows_.push_back(app_window);
}
diff --git a/extensions/browser/content_hash_fetcher_unittest.cc b/extensions/browser/content_hash_fetcher_unittest.cc
index 02ec8aa..6e643d3 100644
--- a/extensions/browser/content_hash_fetcher_unittest.cc
+++ b/extensions/browser/content_hash_fetcher_unittest.cc
@@ -306,8 +306,7 @@
ASSERT_NE(nullptr, result.get());
EXPECT_TRUE(result->success);
EXPECT_FALSE(result->was_cancelled);
- EXPECT_TRUE(
- base::ContainsKey(result->mismatch_paths, script_path.BaseName()));
+ EXPECT_TRUE(base::Contains(result->mismatch_paths, script_path.BaseName()));
// Make sure the verified_contents.json file was written into the extension's
// install dir.
diff --git a/extensions/browser/content_verifier.cc b/extensions/browser/content_verifier.cc
index 36fc369..52480ce 100644
--- a/extensions/browser/content_verifier.cc
+++ b/extensions/browser/content_verifier.cc
@@ -696,10 +696,10 @@
// Background pages, scripts and content scripts should always be verified
// regardless of their file type.
- if (base::ContainsKey(background_or_content_paths, relative_unix_path))
+ if (base::Contains(background_or_content_paths, relative_unix_path))
return true;
- if (base::ContainsKey(browser_images, relative_unix_path))
+ if (base::Contains(browser_images, relative_unix_path))
continue;
base::FilePath full_path =
@@ -723,8 +723,8 @@
// _locales/<some locale>/messages.json - if so then skip it.
if (full_path.BaseName() == messages_file &&
full_path.DirName().DirName() == locales_dir &&
- base::ContainsKey(*all_locales,
- full_path.DirName().BaseName().MaybeAsASCII())) {
+ base::Contains(*all_locales,
+ full_path.DirName().BaseName().MaybeAsASCII())) {
continue;
}
}
diff --git a/extensions/browser/event_listener_map.cc b/extensions/browser/event_listener_map.cc
index d7d18d53..29a399e 100644
--- a/extensions/browser/event_listener_map.cc
+++ b/extensions/browser/event_listener_map.cc
@@ -346,7 +346,7 @@
}
bool EventListenerMap::IsFilteredEvent(const Event& event) const {
- return base::ContainsKey(filtered_events_, event.event_name);
+ return base::Contains(filtered_events_, event.event_name);
}
} // namespace extensions
diff --git a/extensions/browser/events/lazy_event_dispatcher.cc b/extensions/browser/events/lazy_event_dispatcher.cc
index fc3aa96..fe30c55 100644
--- a/extensions/browser/events/lazy_event_dispatcher.cc
+++ b/extensions/browser/events/lazy_event_dispatcher.cc
@@ -53,7 +53,7 @@
bool LazyEventDispatcher::HasAlreadyDispatched(
const LazyContextId& dispatch_context) const {
- return base::ContainsKey(dispatched_ids_, dispatch_context);
+ return base::Contains(dispatched_ids_, dispatch_context);
}
bool LazyEventDispatcher::QueueEventDispatch(
diff --git a/extensions/browser/extension_registrar.cc b/extensions/browser/extension_registrar.cc
index ea8e8b37..3c54b852 100644
--- a/extensions/browser/extension_registrar.cc
+++ b/extensions/browser/extension_registrar.cc
@@ -355,7 +355,7 @@
// even if it's not permanently installed.
unloaded_extension_paths_[extension->id()] = extension->path();
- DCHECK(!base::ContainsKey(reloading_extensions_, extension->id()))
+ DCHECK(!base::Contains(reloading_extensions_, extension->id()))
<< "Enabled extension shouldn't be marked for reloading";
registry_->AddTerminated(extension);
@@ -513,7 +513,7 @@
// For orphaned devtools, we will reconnect devtools to it later in
// DidCreateRenderViewForBackgroundPage().
bool has_orphaned_dev_tools =
- base::ContainsKey(orphaned_dev_tools_, extension->id());
+ base::Contains(orphaned_dev_tools_, extension->id());
// Reloading component extension does not trigger install, so RuntimeAPI won't
// be able to detect its loading. Therefore, we need to spin up its lazy
diff --git a/extensions/browser/guest_view/mime_handler_view/mime_handler_view_attach_helper.cc b/extensions/browser/guest_view/mime_handler_view/mime_handler_view_attach_helper.cc
index 8a68ece..ad188c0 100644
--- a/extensions/browser/guest_view/mime_handler_view/mime_handler_view_attach_helper.cc
+++ b/extensions/browser/guest_view/mime_handler_view/mime_handler_view_attach_helper.cc
@@ -74,7 +74,7 @@
int32_t render_process_id) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
auto& map = *GetProcessIdToHelperMap();
- if (!base::ContainsKey(map, render_process_id)) {
+ if (!base::Contains(map, render_process_id)) {
auto* process_host = content::RenderProcessHost::FromID(render_process_id);
if (!process_host)
return nullptr;
diff --git a/extensions/browser/guest_view/mime_handler_view/mime_handler_view_embedder.cc b/extensions/browser/guest_view/mime_handler_view/mime_handler_view_embedder.cc
index 31f32ff6..1a9beda 100644
--- a/extensions/browser/guest_view/mime_handler_view/mime_handler_view_embedder.cc
+++ b/extensions/browser/guest_view/mime_handler_view/mime_handler_view_embedder.cc
@@ -50,8 +50,8 @@
const std::string& mime_type,
const std::string& stream_id,
const std::string& internal_id) {
- DCHECK(!base::ContainsKey(*GetMimeHandlerViewEmbeddersMap(),
- frame_tree_node_id));
+ DCHECK(
+ !base::Contains(*GetMimeHandlerViewEmbeddersMap(), frame_tree_node_id));
GetMimeHandlerViewEmbeddersMap()->insert_or_assign(
frame_tree_node_id, base::WrapUnique(new MimeHandlerViewEmbedder(
frame_tree_node_id, resource_url, mime_type,
diff --git a/extensions/browser/image_sanitizer_unittest.cc b/extensions/browser/image_sanitizer_unittest.cc
index 44e311f..a14e2b6 100644
--- a/extensions/browser/image_sanitizer_unittest.cc
+++ b/extensions/browser/image_sanitizer_unittest.cc
@@ -268,7 +268,7 @@
EXPECT_TRUE(base::GetFileSize(full_path, &file_size));
EXPECT_GT(file_size, 0);
- ASSERT_TRUE(base::ContainsKey(*decoded_images(), path));
+ ASSERT_TRUE(base::Contains(*decoded_images(), path));
EXPECT_FALSE((*decoded_images())[path].drawsNothing());
}
// No extra images should have been reported.
diff --git a/extensions/browser/lazy_background_task_queue.cc b/extensions/browser/lazy_background_task_queue.cc
index c0a5fe3..523134f 100644
--- a/extensions/browser/lazy_background_task_queue.cc
+++ b/extensions/browser/lazy_background_task_queue.cc
@@ -233,7 +233,7 @@
content::BrowserContext* browser_context,
const Extension* extension) {
PendingTasksKey key(browser_context, extension->id());
- if (!base::ContainsKey(pending_tasks_, key))
+ if (!base::Contains(pending_tasks_, key))
return;
ProcessManager* pm = ProcessManager::Get(browser_context);
diff --git a/extensions/browser/renderer_startup_helper.cc b/extensions/browser/renderer_startup_helper.cc
index a930cfa6..1e368fe 100644
--- a/extensions/browser/renderer_startup_helper.cc
+++ b/extensions/browser/renderer_startup_helper.cc
@@ -151,8 +151,8 @@
ExtensionRegistry::Get(browser_context_)->enabled_extensions();
for (const auto& ext : extensions) {
// OnLoadedExtension should have already been called for the extension.
- DCHECK(base::ContainsKey(extension_process_map_, ext->id()));
- DCHECK(!base::ContainsKey(extension_process_map_[ext->id()], process));
+ DCHECK(base::Contains(extension_process_map_, ext->id()));
+ DCHECK(!base::Contains(extension_process_map_[ext->id()], process));
if (!IsExtensionVisibleToContext(*ext, renderer_context))
continue;
@@ -174,8 +174,8 @@
for (const ExtensionId& id : iter->second) {
// The extension should be loaded in the process.
DCHECK(extensions.Contains(id));
- DCHECK(base::ContainsKey(extension_process_map_, id));
- DCHECK(base::ContainsKey(extension_process_map_[id], process));
+ DCHECK(base::Contains(extension_process_map_, id));
+ DCHECK(base::Contains(extension_process_map_[id], process));
process->Send(new ExtensionMsg_ActivateExtension(id));
}
}
@@ -202,7 +202,7 @@
content::RenderProcessHost* process) {
// The extension should have been loaded already. Dump without crashing to
// debug crbug.com/528026.
- if (!base::ContainsKey(extension_process_map_, extension.id())) {
+ if (!base::Contains(extension_process_map_, extension.id())) {
#if DCHECK_IS_ON()
NOTREACHED() << "Extension " << extension.id()
<< "activated before loading";
@@ -215,8 +215,8 @@
if (!IsExtensionVisibleToContext(extension, process->GetBrowserContext()))
return;
- if (base::ContainsKey(initialized_processes_, process)) {
- DCHECK(base::ContainsKey(extension_process_map_[extension.id()], process));
+ if (base::Contains(initialized_processes_, process)) {
+ DCHECK(base::Contains(extension_process_map_[extension.id()], process));
process->Send(new ExtensionMsg_ActivateExtension(extension.id()));
} else {
pending_active_extensions_[process].insert(extension.id());
@@ -227,7 +227,7 @@
// Extension was already loaded.
// TODO(crbug.com/708230): Ensure that clients don't call this for an
// already loaded extension and change this to a DCHECK.
- if (base::ContainsKey(extension_process_map_, extension.id()))
+ if (base::Contains(extension_process_map_, extension.id()))
return;
// Mark the extension as loaded.
@@ -274,13 +274,13 @@
// Extension is not loaded.
// TODO(crbug.com/708230): Ensure that clients call this for a loaded
// extension only and change this to a DCHECK.
- if (!base::ContainsKey(extension_process_map_, extension.id()))
+ if (!base::Contains(extension_process_map_, extension.id()))
return;
const std::set<content::RenderProcessHost*>& loaded_process_set =
extension_process_map_[extension.id()];
for (content::RenderProcessHost* process : loaded_process_set) {
- DCHECK(base::ContainsKey(initialized_processes_, process));
+ DCHECK(base::Contains(initialized_processes_, process));
process->Send(new ExtensionMsg_Unloaded(extension.id()));
}
diff --git a/extensions/browser/renderer_startup_helper_unittest.cc b/extensions/browser/renderer_startup_helper_unittest.cc
index 7afa40f..bcc5f85b 100644
--- a/extensions/browser/renderer_startup_helper_unittest.cc
+++ b/extensions/browser/renderer_startup_helper_unittest.cc
@@ -110,25 +110,24 @@
}
bool IsProcessInitialized(content::RenderProcessHost* rph) {
- return base::ContainsKey(helper_->initialized_processes_, rph);
+ return base::Contains(helper_->initialized_processes_, rph);
}
bool IsExtensionLoaded(const Extension& extension) {
- return base::ContainsKey(helper_->extension_process_map_, extension.id());
+ return base::Contains(helper_->extension_process_map_, extension.id());
}
bool IsExtensionLoadedInProcess(const Extension& extension,
content::RenderProcessHost* rph) {
return IsExtensionLoaded(extension) &&
- base::ContainsKey(helper_->extension_process_map_[extension.id()],
- rph);
+ base::Contains(helper_->extension_process_map_[extension.id()], rph);
}
bool IsExtensionPendingActivationInProcess(const Extension& extension,
content::RenderProcessHost* rph) {
- return base::ContainsKey(helper_->pending_active_extensions_, rph) &&
- base::ContainsKey(helper_->pending_active_extensions_[rph],
- extension.id());
+ return base::Contains(helper_->pending_active_extensions_, rph) &&
+ base::Contains(helper_->pending_active_extensions_[rph],
+ extension.id());
}
std::unique_ptr<RendererStartupHelper> helper_;
diff --git a/extensions/browser/service_worker_task_queue.cc b/extensions/browser/service_worker_task_queue.cc
index a81018a..27e1a76 100644
--- a/extensions/browser/service_worker_task_queue.cc
+++ b/extensions/browser/service_worker_task_queue.cc
@@ -324,8 +324,8 @@
int64_t version_id,
int process_id,
int thread_id) {
- if (!base::ContainsKey(loaded_workers_, context_id) ||
- !base::ContainsKey(started_workers_, context_id)) {
+ if (!base::Contains(loaded_workers_, context_id) ||
+ !base::Contains(started_workers_, context_id)) {
// The worker hasn't finished starting (DidStartWorkerForScope) or hasn't
// finished loading (DidStartServiceWorkerContext).
// Wait for the next event, and run the tasks then.
diff --git a/extensions/browser/url_loader_factory_manager.cc b/extensions/browser/url_loader_factory_manager.cc
index 7da47628..1373f0a 100644
--- a/extensions/browser/url_loader_factory_manager.cc
+++ b/extensions/browser/url_loader_factory_manager.cc
@@ -317,7 +317,7 @@
const std::string& hash = extension.hashed_id().value();
DCHECK(IsValidHashedExtensionId(hash));
- return base::ContainsKey(GetExtensionsAllowlist(), hash);
+ return base::Contains(GetExtensionsAllowlist(), hash);
}
// Safe fallback for future extension manifest versions.
@@ -435,7 +435,7 @@
content::WebContents::FromRenderFrameHost(found_frame)->GetOpener();
}
if (!next_candidate ||
- base::ContainsKey(already_visited_frames, next_candidate)) {
+ base::Contains(already_visited_frames, next_candidate)) {
break;
}
diff --git a/extensions/browser/verified_contents.cc b/extensions/browser/verified_contents.cc
index 9d8032b..489ec82 100644
--- a/extensions/browser/verified_contents.cc
+++ b/extensions/browser/verified_contents.cc
@@ -246,13 +246,13 @@
const base::FilePath& relative_path) const {
base::FilePath::StringType path = base::ToLowerASCII(
relative_path.NormalizePathSeparatorsTo('/').value());
- if (base::ContainsKey(root_hashes_, path))
+ if (base::Contains(root_hashes_, path))
return true;
#if defined(OS_WIN)
base::FilePath::StringType trimmed_path;
if (TrimDotSpaceSuffix(path, &trimmed_path))
- return base::ContainsKey(root_hashes_, trimmed_path);
+ return base::Contains(root_hashes_, trimmed_path);
#endif // defined(OS_WIN)
return false;
}
diff --git a/extensions/browser/zipfile_installer.cc b/extensions/browser/zipfile_installer.cc
index 3fc0f68..b748b7a6 100644
--- a/extensions/browser/zipfile_installer.cc
+++ b/extensions/browser/zipfile_installer.cc
@@ -203,7 +203,7 @@
// Allow filenames with no extension.
if (extension.empty())
return true;
- return base::ContainsValue(kAllowedThemeFiletypes, extension);
+ return base::Contains(kAllowedThemeFiletypes, extension);
}
return !base::FilePath::CompareEqualIgnoreCase(file_path.FinalExtension(),
FILE_PATH_LITERAL(".exe"));
