Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(138)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/browser/service_worker/service_worker_database_unittest.cc

Issue 2228403003: content: Use stl utilities from the base namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/service_worker/service_worker_context_core_unittest.cc ('k') | content/browser/service_worker/service_worker_job_coordinator.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/service_worker/service_worker_database_unittest.cc
diff --git a/content/browser/service_worker/service_worker_database_unittest.cc b/content/browser/service_worker/service_worker_database_unittest.cc
index 391905470dbe6f20b98f425eeaa04718394aea4c..3fd37789d2512c016f07481202fee9d35b3a70e1 100644
--- a/content/browser/service_worker/service_worker_database_unittest.cc
+++ b/content/browser/service_worker/service_worker_database_unittest.cc
@@ -393,9 +393,9 @@ TEST(ServiceWorkerDatabaseTest, GetOriginsWithRegistrations) {
EXPECT_EQ(ServiceWorkerDatabase::STATUS_OK,
database->GetOriginsWithRegistrations(&origins));
EXPECT_EQ(3U, origins.size());
- EXPECT_TRUE(ContainsKey(origins, origin1));
- EXPECT_TRUE(ContainsKey(origins, origin2));
- EXPECT_TRUE(ContainsKey(origins, origin3));
+ EXPECT_TRUE(base::ContainsKey(origins, origin1));
+ EXPECT_TRUE(base::ContainsKey(origins, origin2));
+ EXPECT_TRUE(base::ContainsKey(origins, origin3));
// |origin3| has another registration, so should not remove it from the
// unique origin list.
@@ -410,9 +410,9 @@ TEST(ServiceWorkerDatabaseTest, GetOriginsWithRegistrations) {
EXPECT_EQ(ServiceWorkerDatabase::STATUS_OK,
database->GetOriginsWithRegistrations(&origins));
EXPECT_EQ(3U, origins.size());
- EXPECT_TRUE(ContainsKey(origins, origin1));
- EXPECT_TRUE(ContainsKey(origins, origin2));
- EXPECT_TRUE(ContainsKey(origins, origin3));
+ EXPECT_TRUE(base::ContainsKey(origins, origin1));
+ EXPECT_TRUE(base::ContainsKey(origins, origin2));
+ EXPECT_TRUE(base::ContainsKey(origins, origin3));
// |origin3| should be removed from the unique origin list.
ASSERT_EQ(ServiceWorkerDatabase::STATUS_OK,
@@ -426,8 +426,8 @@ TEST(ServiceWorkerDatabaseTest, GetOriginsWithRegistrations) {
EXPECT_EQ(ServiceWorkerDatabase::STATUS_OK,
database->GetOriginsWithRegistrations(&origins));
EXPECT_EQ(2U, origins.size());
- EXPECT_TRUE(ContainsKey(origins, origin1));
- EXPECT_TRUE(ContainsKey(origins, origin2));
+ EXPECT_TRUE(base::ContainsKey(origins, origin1));
+ EXPECT_TRUE(base::ContainsKey(origins, origin2));
}
TEST(ServiceWorkerDatabaseTest, GetRegistrationsForOrigin) {
@@ -695,8 +695,8 @@ TEST(ServiceWorkerDatabaseTest, Registration_Basic) {
EXPECT_EQ(ServiceWorkerDatabase::STATUS_OK,
database->GetPurgeableResourceIds(&purgeable_ids_out));
EXPECT_EQ(2u, purgeable_ids_out.size());
- EXPECT_TRUE(ContainsKey(purgeable_ids_out, resources[0].resource_id));
- EXPECT_TRUE(ContainsKey(purgeable_ids_out, resources[1].resource_id));
+ EXPECT_TRUE(base::ContainsKey(purgeable_ids_out, resources[0].resource_id));
+ EXPECT_TRUE(base::ContainsKey(purgeable_ids_out, resources[1].resource_id));
}
TEST(ServiceWorkerDatabaseTest, DeleteNonExistentRegistration) {
@@ -819,8 +819,8 @@ TEST(ServiceWorkerDatabaseTest, Registration_Overwrite) {
EXPECT_EQ(ServiceWorkerDatabase::STATUS_OK,
database->GetPurgeableResourceIds(&purgeable_ids_out));
EXPECT_EQ(2u, purgeable_ids_out.size());
- EXPECT_TRUE(ContainsKey(purgeable_ids_out, resources1[0].resource_id));
- EXPECT_TRUE(ContainsKey(purgeable_ids_out, resources1[1].resource_id));
+ EXPECT_TRUE(base::ContainsKey(purgeable_ids_out, resources1[0].resource_id));
+ EXPECT_TRUE(base::ContainsKey(purgeable_ids_out, resources1[1].resource_id));
}
TEST(ServiceWorkerDatabaseTest, Registration_Multiple) {
@@ -913,8 +913,8 @@ TEST(ServiceWorkerDatabaseTest, Registration_Multiple) {
EXPECT_EQ(ServiceWorkerDatabase::STATUS_OK,
database->GetPurgeableResourceIds(&purgeable_ids_out));
EXPECT_EQ(2u, purgeable_ids_out.size());
- EXPECT_TRUE(ContainsKey(purgeable_ids_out, resources1[0].resource_id));
- EXPECT_TRUE(ContainsKey(purgeable_ids_out, resources1[1].resource_id));
+ EXPECT_TRUE(base::ContainsKey(purgeable_ids_out, resources1[0].resource_id));
+ EXPECT_TRUE(base::ContainsKey(purgeable_ids_out, resources1[1].resource_id));
// Make sure that registration2 is still alive.
resources_out.clear();
@@ -1561,14 +1561,14 @@ TEST(ServiceWorkerDatabaseTest, DeleteAllDataForOrigin) {
EXPECT_EQ(ServiceWorkerDatabase::STATUS_OK,
database->GetOriginsWithRegistrations(&unique_origins));
EXPECT_EQ(1u, unique_origins.size());
- EXPECT_TRUE(ContainsKey(unique_origins, origin2));
+ EXPECT_TRUE(base::ContainsKey(unique_origins, origin2));
// |origin1| should be removed from the foreign fetch origin list.
unique_origins.clear();
EXPECT_EQ(ServiceWorkerDatabase::STATUS_OK,
database->GetOriginsWithForeignFetchRegistrations(&unique_origins));
EXPECT_EQ(1u, unique_origins.size());
- EXPECT_TRUE(ContainsKey(unique_origins, origin2));
+ EXPECT_TRUE(base::ContainsKey(unique_origins, origin2));
// The registrations for |origin1| should be removed.
std::vector<RegistrationData> registrations;
@@ -1598,10 +1598,10 @@ TEST(ServiceWorkerDatabaseTest, DeleteAllDataForOrigin) {
EXPECT_EQ(ServiceWorkerDatabase::STATUS_OK,
database->GetPurgeableResourceIds(&purgeable_ids_out));
EXPECT_EQ(4u, purgeable_ids_out.size());
- EXPECT_TRUE(ContainsKey(purgeable_ids_out, 1));
- EXPECT_TRUE(ContainsKey(purgeable_ids_out, 2));
- EXPECT_TRUE(ContainsKey(purgeable_ids_out, 3));
- EXPECT_TRUE(ContainsKey(purgeable_ids_out, 4));
+ EXPECT_TRUE(base::ContainsKey(purgeable_ids_out, 1));
+ EXPECT_TRUE(base::ContainsKey(purgeable_ids_out, 2));
+ EXPECT_TRUE(base::ContainsKey(purgeable_ids_out, 3));
+ EXPECT_TRUE(base::ContainsKey(purgeable_ids_out, 4));
// The user data associated with |origin1| should be removed.
std::vector<std::string> user_data_out;
@@ -1726,8 +1726,8 @@ TEST(ServiceWorkerDatabaseTest, GetOriginsWithForeignFetchRegistrations) {
EXPECT_EQ(ServiceWorkerDatabase::STATUS_OK,
database->GetOriginsWithForeignFetchRegistrations(&origins));
EXPECT_EQ(2U, origins.size());
- EXPECT_TRUE(ContainsKey(origins, origin1));
- EXPECT_TRUE(ContainsKey(origins, origin3));
+ EXPECT_TRUE(base::ContainsKey(origins, origin1));
+ EXPECT_TRUE(base::ContainsKey(origins, origin3));
// |origin3| has another registration, so should not remove it from the
// foreign fetch origin list.
@@ -1741,8 +1741,8 @@ TEST(ServiceWorkerDatabaseTest, GetOriginsWithForeignFetchRegistrations) {
EXPECT_EQ(ServiceWorkerDatabase::STATUS_OK,
database->GetOriginsWithForeignFetchRegistrations(&origins));
EXPECT_EQ(2U, origins.size());
- EXPECT_TRUE(ContainsKey(origins, origin1));
- EXPECT_TRUE(ContainsKey(origins, origin3));
+ EXPECT_TRUE(base::ContainsKey(origins, origin1));
+ EXPECT_TRUE(base::ContainsKey(origins, origin3));
// |origin3| should be removed from the foreign fetch origin list, since its
// only remaining registration doesn't have foreign fetch scopes.
@@ -1756,7 +1756,7 @@ TEST(ServiceWorkerDatabaseTest, GetOriginsWithForeignFetchRegistrations) {
EXPECT_EQ(ServiceWorkerDatabase::STATUS_OK,
database->GetOriginsWithForeignFetchRegistrations(&origins));
EXPECT_EQ(1U, origins.size());
- EXPECT_TRUE(ContainsKey(origins, origin1));
+ EXPECT_TRUE(base::ContainsKey(origins, origin1));
// |origin1| should be removed from the foreign fetch origin list, since we
// replace its registration with one without scopes.
« no previous file with comments | « content/browser/service_worker/service_worker_context_core_unittest.cc ('k') | content/browser/service_worker/service_worker_job_coordinator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698