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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1221643014: Service Worker: Migrate to version_uuid and surface ServiceWorker.id. (Chromium 2/3) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 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_database.proto ('k') | content/browser/service_worker/service_worker_disk_cache_migrator_unittest.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 1d19f2237b81bdcf396a4630e9c711f8efd83dd0..1832c87bf2deacc6ab21659aa3ed745a754fbee6 100644
--- a/content/browser/service_worker/service_worker_database_unittest.cc
+++ b/content/browser/service_worker/service_worker_database_unittest.cc
@@ -57,7 +57,7 @@ void VerifyRegistrationData(const RegistrationData& expected,
EXPECT_EQ(expected.registration_id, actual.registration_id);
EXPECT_EQ(expected.scope, actual.scope);
EXPECT_EQ(expected.script, actual.script);
- EXPECT_EQ(expected.version_id, actual.version_id);
+ EXPECT_EQ(expected.version_uuid, actual.version_uuid);
EXPECT_EQ(expected.is_active, actual.is_active);
EXPECT_EQ(expected.has_fetch_handler, actual.has_fetch_handler);
EXPECT_EQ(expected.last_update_check, actual.last_update_check);
@@ -163,7 +163,7 @@ TEST(ServiceWorkerDatabaseTest, DiskCacheMigrationState) {
data.registration_id = 100;
data.scope = URL(origin, "/foo");
data.script = URL(origin, "/script.js");
- data.version_id = 200;
+ data.version_uuid = "1b304e16-1464-4a75-855a-4e4e62baac81";
data.resources_total_size_bytes = 300;
resources.push_back(CreateResource(1, data.script, 300));
ASSERT_EQ(ServiceWorkerDatabase::STATUS_OK,
@@ -222,7 +222,7 @@ TEST(ServiceWorkerDatabaseTest, UpgradeSchemaToVersion2) {
data.registration_id = 100;
data.scope = URL(origin, "/foo");
data.script = URL(origin, "/script1.js");
- data.version_id = 200;
+ data.version_uuid = "1b304e16-1464-4a75-855a-4e4e62baac81";
data.resources_total_size_bytes = 300;
resources.push_back(CreateResource(1, data.script, 300));
ASSERT_EQ(ServiceWorkerDatabase::STATUS_OK,
@@ -274,17 +274,15 @@ TEST(ServiceWorkerDatabaseTest, GetNextAvailableIds) {
// The database has never been used, so returns initial values.
AvailableIds ids;
- EXPECT_EQ(ServiceWorkerDatabase::STATUS_OK, database->GetNextAvailableIds(
- &ids.reg_id, &ids.ver_id, &ids.res_id));
+ EXPECT_EQ(ServiceWorkerDatabase::STATUS_OK,
+ database->GetNextAvailableIds(&ids.reg_id, &ids.res_id));
EXPECT_EQ(0, ids.reg_id);
- EXPECT_EQ(0, ids.ver_id);
EXPECT_EQ(0, ids.res_id);
ASSERT_EQ(ServiceWorkerDatabase::STATUS_OK, database->LazyOpen(true));
- EXPECT_EQ(ServiceWorkerDatabase::STATUS_OK, database->GetNextAvailableIds(
- &ids.reg_id, &ids.ver_id, &ids.res_id));
+ EXPECT_EQ(ServiceWorkerDatabase::STATUS_OK,
+ database->GetNextAvailableIds(&ids.reg_id, &ids.res_id));
EXPECT_EQ(0, ids.reg_id);
- EXPECT_EQ(0, ids.ver_id);
EXPECT_EQ(0, ids.res_id);
// Writing a registration bumps the next available ids.
@@ -295,17 +293,16 @@ TEST(ServiceWorkerDatabaseTest, GetNextAvailableIds) {
data1.registration_id = 100;
data1.scope = URL(origin, "/foo");
data1.script = URL(origin, "/script1.js");
- data1.version_id = 200;
+ data1.version_uuid = "1b304e16-1464-4a75-855a-4e4e62baac81";
data1.resources_total_size_bytes = 300;
resources1.push_back(CreateResource(1, data1.script, 300));
ASSERT_EQ(ServiceWorkerDatabase::STATUS_OK,
database->WriteRegistration(data1, resources1, &deleted_version,
&newly_purgeable_resources));
- EXPECT_EQ(ServiceWorkerDatabase::STATUS_OK, database->GetNextAvailableIds(
- &ids.reg_id, &ids.ver_id, &ids.res_id));
+ EXPECT_EQ(ServiceWorkerDatabase::STATUS_OK,
+ database->GetNextAvailableIds(&ids.reg_id, &ids.res_id));
EXPECT_EQ(101, ids.reg_id);
- EXPECT_EQ(201, ids.ver_id);
EXPECT_EQ(0, ids.res_id);
// Writing uncommitted resources bumps the next available id.
@@ -314,11 +311,9 @@ TEST(ServiceWorkerDatabaseTest, GetNextAvailableIds) {
ServiceWorkerDatabase::STATUS_OK,
database->WriteUncommittedResourceIds(std::set<int64>(
kUncommittedIds, kUncommittedIds + arraysize(kUncommittedIds))));
- EXPECT_EQ(
- ServiceWorkerDatabase::STATUS_OK,
- database->GetNextAvailableIds(&ids.reg_id, &ids.ver_id, &ids.res_id));
+ EXPECT_EQ(ServiceWorkerDatabase::STATUS_OK,
+ database->GetNextAvailableIds(&ids.reg_id, &ids.res_id));
EXPECT_EQ(101, ids.reg_id);
- EXPECT_EQ(201, ids.ver_id);
EXPECT_EQ(11, ids.res_id);
// Writing purgeable resources bumps the next available id.
@@ -326,11 +321,9 @@ TEST(ServiceWorkerDatabaseTest, GetNextAvailableIds) {
EXPECT_EQ(ServiceWorkerDatabase::STATUS_OK,
database->WriteUncommittedResourceIds(std::set<int64>(
kPurgeableIds, kPurgeableIds + arraysize(kPurgeableIds))));
- EXPECT_EQ(
- ServiceWorkerDatabase::STATUS_OK,
- database->GetNextAvailableIds(&ids.reg_id, &ids.ver_id, &ids.res_id));
+ EXPECT_EQ(ServiceWorkerDatabase::STATUS_OK,
+ database->GetNextAvailableIds(&ids.reg_id, &ids.res_id));
EXPECT_EQ(101, ids.reg_id);
- EXPECT_EQ(201, ids.ver_id);
EXPECT_EQ(21, ids.res_id);
// Writing a registration whose ids are lower than the stored ones should not
@@ -339,7 +332,7 @@ TEST(ServiceWorkerDatabaseTest, GetNextAvailableIds) {
data2.registration_id = 10;
data2.scope = URL(origin, "/bar");
data2.script = URL(origin, "/script2.js");
- data2.version_id = 20;
+ data2.version_uuid = "a616c852-7fc0-46c4-9f6e-0f6f2cb4aa4c";
data2.resources_total_size_bytes = 400;
std::vector<Resource> resources2;
resources2.push_back(CreateResource(2, data2.script, 400));
@@ -356,10 +349,9 @@ TEST(ServiceWorkerDatabaseTest, GetNextAvailableIds) {
// Close and reopen the database to verify the stored values.
database.reset(CreateDatabase(database_dir.path()));
- EXPECT_EQ(ServiceWorkerDatabase::STATUS_OK, database->GetNextAvailableIds(
- &ids.reg_id, &ids.ver_id, &ids.res_id));
+ EXPECT_EQ(ServiceWorkerDatabase::STATUS_OK,
+ database->GetNextAvailableIds(&ids.reg_id, &ids.res_id));
EXPECT_EQ(101, ids.reg_id);
- EXPECT_EQ(201, ids.ver_id);
EXPECT_EQ(21, ids.res_id);
}
@@ -379,7 +371,7 @@ TEST(ServiceWorkerDatabaseTest, GetOriginsWithRegistrations) {
data1.registration_id = 123;
data1.scope = URL(origin1, "/foo");
data1.script = URL(origin1, "/script1.js");
- data1.version_id = 456;
+ data1.version_uuid = "0ab2638a-2005-411e-aa89-76e14892b618";
data1.resources_total_size_bytes = 100;
std::vector<Resource> resources1;
resources1.push_back(CreateResource(1, data1.script, 100));
@@ -392,7 +384,7 @@ TEST(ServiceWorkerDatabaseTest, GetOriginsWithRegistrations) {
data2.registration_id = 234;
data2.scope = URL(origin2, "/bar");
data2.script = URL(origin2, "/script2.js");
- data2.version_id = 567;
+ data2.version_uuid = "0acb271b-b4eb-4323-b049-6db3d1571c43";
data2.resources_total_size_bytes = 200;
std::vector<Resource> resources2;
resources2.push_back(CreateResource(2, data2.script, 200));
@@ -405,7 +397,7 @@ TEST(ServiceWorkerDatabaseTest, GetOriginsWithRegistrations) {
data3.registration_id = 345;
data3.scope = URL(origin3, "/hoge");
data3.script = URL(origin3, "/script3.js");
- data3.version_id = 678;
+ data3.version_uuid = "de8cc4f5-3f3b-4f60-b4f5-d4ddc1cb5e69";
data3.resources_total_size_bytes = 300;
std::vector<Resource> resources3;
resources3.push_back(CreateResource(3, data3.script, 300));
@@ -418,7 +410,7 @@ TEST(ServiceWorkerDatabaseTest, GetOriginsWithRegistrations) {
data4.registration_id = 456;
data4.scope = URL(origin3, "/fuga");
data4.script = URL(origin3, "/script4.js");
- data4.version_id = 789;
+ data4.version_uuid = "fe7fcca9-904b-4e45-85e2-2414c4424f18";
data4.resources_total_size_bytes = 400;
std::vector<Resource> resources4;
resources4.push_back(CreateResource(4, data4.script, 400));
@@ -489,7 +481,7 @@ TEST(ServiceWorkerDatabaseTest, GetRegistrationsForOrigin) {
data1.registration_id = 100;
data1.scope = URL(origin1, "/foo");
data1.script = URL(origin1, "/script1.js");
- data1.version_id = 1000;
+ data1.version_uuid = "5e837d34-3ad6-4043-bcea-41bc02ec203e";
data1.resources_total_size_bytes = 100;
std::vector<Resource> resources1;
resources1.push_back(CreateResource(1, data1.script, 100));
@@ -511,7 +503,7 @@ TEST(ServiceWorkerDatabaseTest, GetRegistrationsForOrigin) {
data2.registration_id = 200;
data2.scope = URL(origin2, "/bar");
data2.script = URL(origin2, "/script2.js");
- data2.version_id = 2000;
+ data2.version_uuid = "9bb6c620-8ea3-4b17-9654-e0346a8fc2ce";
data2.resources_total_size_bytes = 200;
std::vector<Resource> resources2;
resources2.push_back(CreateResource(2, data2.script, 200));
@@ -533,7 +525,7 @@ TEST(ServiceWorkerDatabaseTest, GetRegistrationsForOrigin) {
data3.registration_id = 300;
data3.scope = URL(origin3, "/hoge");
data3.script = URL(origin3, "/script3.js");
- data3.version_id = 3000;
+ data3.version_uuid = "afa0e540-8432-491e-af58-9461850477dd";
data3.resources_total_size_bytes = 300;
std::vector<Resource> resources3;
resources3.push_back(CreateResource(3, data3.script, 300));
@@ -546,7 +538,7 @@ TEST(ServiceWorkerDatabaseTest, GetRegistrationsForOrigin) {
data4.registration_id = 400;
data4.scope = URL(origin3, "/fuga");
data4.script = URL(origin3, "/script4.js");
- data4.version_id = 4000;
+ data4.version_uuid = "142b546d-5b7c-4932-89b9-efca171bd28f";
data4.resources_total_size_bytes = 400;
std::vector<Resource> resources4;
resources4.push_back(CreateResource(4, data4.script, 400));
@@ -592,7 +584,7 @@ TEST(ServiceWorkerDatabaseTest, GetAllRegistrations) {
data1.registration_id = 100;
data1.scope = URL(origin1, "/foo");
data1.script = URL(origin1, "/script1.js");
- data1.version_id = 1000;
+ data1.version_uuid = "5e837d34-3ad6-4043-bcea-41bc02ec203e";
data1.resources_total_size_bytes = 100;
std::vector<Resource> resources1;
resources1.push_back(CreateResource(1, data1.script, 100));
@@ -605,7 +597,7 @@ TEST(ServiceWorkerDatabaseTest, GetAllRegistrations) {
data2.registration_id = 200;
data2.scope = URL(origin2, "/bar");
data2.script = URL(origin2, "/script2.js");
- data2.version_id = 2000;
+ data2.version_uuid = "9bb6c620-8ea3-4b17-9654-e0346a8fc2ce";
data2.resources_total_size_bytes = 200;
std::vector<Resource> resources2;
resources2.push_back(CreateResource(2, data2.script, 200));
@@ -618,7 +610,7 @@ TEST(ServiceWorkerDatabaseTest, GetAllRegistrations) {
data3.registration_id = 300;
data3.scope = URL(origin3, "/hoge");
data3.script = URL(origin3, "/script3.js");
- data3.version_id = 3000;
+ data3.version_uuid = "afa0e540-8432-491e-af58-9461850477dd";
data3.resources_total_size_bytes = 300;
std::vector<Resource> resources3;
resources3.push_back(CreateResource(3, data3.script, 300));
@@ -631,7 +623,7 @@ TEST(ServiceWorkerDatabaseTest, GetAllRegistrations) {
data4.registration_id = 400;
data4.scope = URL(origin3, "/fuga");
data4.script = URL(origin3, "/script4.js");
- data4.version_id = 4000;
+ data4.version_uuid = "142b546d-5b7c-4932-89b9-efca171bd28f";
data4.resources_total_size_bytes = 400;
std::vector<Resource> resources4;
resources4.push_back(CreateResource(4, data4.script, 400));
@@ -657,7 +649,7 @@ TEST(ServiceWorkerDatabaseTest, Registration_Basic) {
data.registration_id = 100;
data.scope = URL(origin, "/foo");
data.script = URL(origin, "/script.js");
- data.version_id = 200;
+ data.version_uuid = "663f73e1-37d6-4ec9-a809-01afdcb1634d";
data.resources_total_size_bytes = 10939 + 200;
std::vector<Resource> resources;
@@ -677,13 +669,14 @@ TEST(ServiceWorkerDatabaseTest, Registration_Basic) {
EXPECT_EQ(uncommitted_ids, uncommitted_ids_out);
ServiceWorkerDatabase::RegistrationData deleted_version;
- deleted_version.version_id = 222; // Dummy initial value
+ deleted_version.version_uuid =
+ "0185fb13-bb72-42ad-8cdc-cbaabf794dc6"; // Dummy initial value
std::vector<int64> newly_purgeable_resources;
EXPECT_EQ(ServiceWorkerDatabase::STATUS_OK,
database->WriteRegistration(
data, resources, &deleted_version, &newly_purgeable_resources));
- EXPECT_EQ(kInvalidServiceWorkerVersionId, deleted_version.version_id);
+ EXPECT_TRUE(deleted_version.version_uuid.empty());
EXPECT_TRUE(newly_purgeable_resources.empty());
// Make sure that the registration and resource records are stored.
@@ -711,7 +704,7 @@ TEST(ServiceWorkerDatabaseTest, Registration_Basic) {
origin,
&deleted_version,
&newly_purgeable_resources));
- EXPECT_EQ(data.version_id, deleted_version.version_id);
+ EXPECT_EQ(data.version_uuid, deleted_version.version_uuid);
ASSERT_EQ(resources.size(), newly_purgeable_resources.size());
for (size_t i = 0; i < resources.size(); ++i)
EXPECT_EQ(newly_purgeable_resources[i], resources[i].resource_id);
@@ -743,7 +736,7 @@ TEST(ServiceWorkerDatabaseTest, DeleteNonExistentRegistration) {
data.registration_id = 100;
data.scope = URL(origin, "/foo");
data.script = URL(origin, "/script.js");
- data.version_id = 200;
+ data.version_uuid = "c4684df5-39e2-4dde-ba61-793c17e61491";
data.resources_total_size_bytes = 19 + 29129;
std::vector<Resource> resources;
@@ -751,37 +744,38 @@ TEST(ServiceWorkerDatabaseTest, DeleteNonExistentRegistration) {
resources.push_back(CreateResource(2, URL(origin, "/resource2"), 29129));
const int64 kNonExistentRegistrationId = 999;
- const int64 kArbitraryVersionId = 222; // Used as a dummy initial value
+ const std::string kArbitraryVersionId =
+ "19682155-36a8-4a21-b8d0-9de545e645a6"; // Used as a dummy initial value
ServiceWorkerDatabase::RegistrationData deleted_version;
- deleted_version.version_id = kArbitraryVersionId;
+ deleted_version.version_uuid = kArbitraryVersionId;
std::vector<int64> newly_purgeable_resources;
EXPECT_EQ(ServiceWorkerDatabase::STATUS_OK,
database->WriteRegistration(
data, resources, &deleted_version, &newly_purgeable_resources));
- EXPECT_EQ(kInvalidServiceWorkerVersionId, deleted_version.version_id);
+ EXPECT_TRUE(deleted_version.version_uuid.empty());
EXPECT_TRUE(newly_purgeable_resources.empty());
// Delete from an origin that has a registration.
- deleted_version.version_id = kArbitraryVersionId;
+ deleted_version.version_uuid = kArbitraryVersionId;
newly_purgeable_resources.clear();
EXPECT_EQ(ServiceWorkerDatabase::STATUS_OK,
database->DeleteRegistration(kNonExistentRegistrationId,
origin,
&deleted_version,
&newly_purgeable_resources));
- EXPECT_EQ(kInvalidServiceWorkerVersionId, deleted_version.version_id);
+ EXPECT_TRUE(deleted_version.version_uuid.empty());
EXPECT_TRUE(newly_purgeable_resources.empty());
// Delete from an origin that has no registration.
- deleted_version.version_id = kArbitraryVersionId;
+ deleted_version.version_uuid = kArbitraryVersionId;
newly_purgeable_resources.clear();
EXPECT_EQ(ServiceWorkerDatabase::STATUS_OK,
database->DeleteRegistration(kNonExistentRegistrationId,
GURL("http://example.net"),
&deleted_version,
&newly_purgeable_resources));
- EXPECT_EQ(kInvalidServiceWorkerVersionId, deleted_version.version_id);
+ EXPECT_TRUE(deleted_version.version_uuid.empty());
EXPECT_TRUE(newly_purgeable_resources.empty());
}
@@ -793,7 +787,7 @@ TEST(ServiceWorkerDatabaseTest, Registration_Overwrite) {
data.registration_id = 100;
data.scope = URL(origin, "/foo");
data.script = URL(origin, "/script.js");
- data.version_id = 200;
+ data.version_uuid = "b294411b-4a2c-4bf4-b072-6775a499bbd7";
data.resources_total_size_bytes = 10 + 11;
std::vector<Resource> resources1;
@@ -801,14 +795,15 @@ TEST(ServiceWorkerDatabaseTest, Registration_Overwrite) {
resources1.push_back(CreateResource(2, URL(origin, "/resource2"), 11));
ServiceWorkerDatabase::RegistrationData deleted_version;
- deleted_version.version_id = 222; // Dummy inital value
+ deleted_version.version_uuid =
+ "904d263b-9872-49f2-bd33-147b98f6d1b8"; // Dummy inital value
std::vector<int64> newly_purgeable_resources;
EXPECT_EQ(
ServiceWorkerDatabase::STATUS_OK,
database->WriteRegistration(
data, resources1, &deleted_version, &newly_purgeable_resources));
- EXPECT_EQ(kInvalidServiceWorkerVersionId, deleted_version.version_id);
+ EXPECT_TRUE(deleted_version.version_uuid.empty());
EXPECT_TRUE(newly_purgeable_resources.empty());
// Make sure that the registration and resource records are stored.
@@ -821,7 +816,8 @@ TEST(ServiceWorkerDatabaseTest, Registration_Overwrite) {
// Update the registration.
RegistrationData updated_data = data;
- updated_data.version_id = data.version_id + 1;
+ updated_data.version_uuid =
+ "a504ba56-4f06-4c48-a904-474e25bca691"; // New version id
updated_data.resources_total_size_bytes = 12 + 13;
std::vector<Resource> resources2;
resources2.push_back(CreateResource(3, URL(origin, "/resource3"), 12));
@@ -832,7 +828,7 @@ TEST(ServiceWorkerDatabaseTest, Registration_Overwrite) {
resources2,
&deleted_version,
&newly_purgeable_resources));
- EXPECT_EQ(data.version_id, deleted_version.version_id);
+ EXPECT_EQ(data.version_uuid, deleted_version.version_uuid);
ASSERT_EQ(resources1.size(), newly_purgeable_resources.size());
for (size_t i = 0; i < resources1.size(); ++i)
EXPECT_EQ(newly_purgeable_resources[i], resources1[i].resource_id);
@@ -865,7 +861,7 @@ TEST(ServiceWorkerDatabaseTest, Registration_Multiple) {
data1.registration_id = 100;
data1.scope = URL(origin, "/foo");
data1.script = URL(origin, "/script1.js");
- data1.version_id = 200;
+ data1.version_uuid = "f731439c-d7ea-423d-91e4-9fc910f439f2";
data1.resources_total_size_bytes = 1451 + 15234;
std::vector<Resource> resources1;
@@ -881,7 +877,7 @@ TEST(ServiceWorkerDatabaseTest, Registration_Multiple) {
data2.registration_id = 101;
data2.scope = URL(origin, "/bar");
data2.script = URL(origin, "/script2.js");
- data2.version_id = 201;
+ data2.version_uuid = "3eba69fd-38f3-4807-a5ac-329d22d91357";
data2.resources_total_size_bytes = 5 + 6;
std::vector<Resource> resources2;
@@ -980,7 +976,7 @@ TEST(ServiceWorkerDatabaseTest, Registration_UninitializedDatabase) {
EXPECT_EQ(ServiceWorkerDatabase::STATUS_OK,
database->DeleteRegistration(
100, origin, &deleted_version, &newly_purgeable_resources));
- EXPECT_EQ(kInvalidServiceWorkerVersionId, deleted_version.version_id);
+ EXPECT_TRUE(deleted_version.version_uuid.empty());
EXPECT_TRUE(newly_purgeable_resources.empty());
// Actually create a new database, but not initialized yet.
@@ -1000,7 +996,7 @@ TEST(ServiceWorkerDatabaseTest, Registration_UninitializedDatabase) {
EXPECT_EQ(ServiceWorkerDatabase::STATUS_OK,
database->DeleteRegistration(
100, origin, &deleted_version, &newly_purgeable_resources));
- EXPECT_EQ(kInvalidServiceWorkerVersionId, deleted_version.version_id);
+ EXPECT_TRUE(deleted_version.version_uuid.empty());
EXPECT_TRUE(newly_purgeable_resources.empty());
}
@@ -1013,7 +1009,7 @@ TEST(ServiceWorkerDatabaseTest, UserData_Basic) {
data.registration_id = 100;
data.scope = URL(kOrigin, "/foo");
data.script = URL(kOrigin, "/script.js");
- data.version_id = 200;
+ data.version_uuid = "85cf6e28-8c50-4abd-9ef5-5f425b893010";
data.resources_total_size_bytes = 100;
std::vector<Resource> resources;
resources.push_back(CreateResource(1, data.script, 100));
@@ -1081,7 +1077,7 @@ TEST(ServiceWorkerDatabaseTest, UserData_DataIsolation) {
data1.registration_id = 100;
data1.scope = URL(kOrigin, "/foo");
data1.script = URL(kOrigin, "/script1.js");
- data1.version_id = 200;
+ data1.version_uuid = "85cf6e28-8c50-4abd-9ef5-5f425b893010";
data1.resources_total_size_bytes = 100;
std::vector<Resource> resources1;
resources1.push_back(CreateResource(1, data1.script, 100));
@@ -1091,7 +1087,7 @@ TEST(ServiceWorkerDatabaseTest, UserData_DataIsolation) {
data2.registration_id = 101;
data2.scope = URL(kOrigin, "/bar");
data2.script = URL(kOrigin, "/script2.js");
- data2.version_id = 201;
+ data2.version_uuid = "645ba1bc-bc64-4867-bfb8-71a909704254";
data2.resources_total_size_bytes = 200;
std::vector<Resource> resources2;
resources2.push_back(CreateResource(2, data2.script, 200));
@@ -1172,7 +1168,7 @@ TEST(ServiceWorkerDatabaseTest, UserData_DeleteRegistration) {
data1.registration_id = 100;
data1.scope = URL(kOrigin, "/foo");
data1.script = URL(kOrigin, "/script1.js");
- data1.version_id = 200;
+ data1.version_uuid = "85cf6e28-8c50-4abd-9ef5-5f425b893010";
data1.resources_total_size_bytes = 100;
std::vector<Resource> resources1;
resources1.push_back(CreateResource(1, data1.script, 100));
@@ -1182,7 +1178,7 @@ TEST(ServiceWorkerDatabaseTest, UserData_DeleteRegistration) {
data2.registration_id = 101;
data2.scope = URL(kOrigin, "/bar");
data2.script = URL(kOrigin, "/script2.js");
- data2.version_id = 201;
+ data2.version_uuid = "645ba1bc-bc64-4867-bfb8-71a909704254";
data2.resources_total_size_bytes = 200;
std::vector<Resource> resources2;
resources2.push_back(CreateResource(2, data2.script, 200));
@@ -1288,7 +1284,7 @@ TEST(ServiceWorkerDatabaseTest, UpdateVersionToActive) {
data.registration_id = 100;
data.scope = URL(origin, "/foo");
data.script = URL(origin, "/script.js");
- data.version_id = 200;
+ data.version_uuid = "85cf6e28-8c50-4abd-9ef5-5f425b893010";
data.is_active = false;
data.resources_total_size_bytes = 100;
std::vector<Resource> resources;
@@ -1348,7 +1344,7 @@ TEST(ServiceWorkerDatabaseTest, UpdateLastCheckTime) {
data.registration_id = 100;
data.scope = URL(origin, "/foo");
data.script = URL(origin, "/script.js");
- data.version_id = 200;
+ data.version_uuid = "85cf6e28-8c50-4abd-9ef5-5f425b893010";
data.last_update_check = base::Time::Now();
data.resources_total_size_bytes = 100;
std::vector<Resource> resources;
@@ -1496,7 +1492,7 @@ TEST(ServiceWorkerDatabaseTest, DeleteAllDataForOrigin) {
data1.registration_id = 10;
data1.scope = URL(origin1, "/foo");
data1.script = URL(origin1, "/script1.js");
- data1.version_id = 100;
+ data1.version_uuid = "8dba4236-45fc-4694-b451-c34b45a4666d";
data1.resources_total_size_bytes = 2013 + 512;
std::vector<Resource> resources1;
@@ -1519,7 +1515,7 @@ TEST(ServiceWorkerDatabaseTest, DeleteAllDataForOrigin) {
data2.registration_id = 11;
data2.scope = URL(origin1, "/bar");
data2.script = URL(origin1, "/script2.js");
- data2.version_id = 101;
+ data2.version_uuid = "9cdf4806-400b-4238-b890-f480273d4ea8";
data2.resources_total_size_bytes = 4 + 5;
std::vector<Resource> resources2;
@@ -1543,7 +1539,7 @@ TEST(ServiceWorkerDatabaseTest, DeleteAllDataForOrigin) {
data3.registration_id = 12;
data3.scope = URL(origin2, "/hoge");
data3.script = URL(origin2, "/script3.js");
- data3.version_id = 102;
+ data3.version_uuid = "743b5448-f6e3-4141-ad5b-2e40118bf07f";
data3.resources_total_size_bytes = 6 + 7;
std::vector<Resource> resources3;
« no previous file with comments | « content/browser/service_worker/service_worker_database.proto ('k') | content/browser/service_worker/service_worker_disk_cache_migrator_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698