ServiceWorker: DB functions should return status code instead of boolean (3)

content/browser/service_worker/service_worker_database_unittest.cc

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 154c4c3c5963510d1f19e60c8e70172842ea0f30..24e827cef469deb796874d35a094a47e93a134db 100644
--- a/content/browser/service_worker/service_worker_database_unittest.cc
+++ b/content/browser/service_worker/service_worker_database_unittest.cc
@@ -115,7 +115,7 @@ TEST(ServiceWorkerDatabaseTest, DatabaseVersion) {
   // version.
   std::vector<ServiceWorkerDatabase::ResourceRecord> resources;
   ServiceWorkerDatabase::RegistrationData data;
-  ASSERT_TRUE(database->WriteRegistration(data, resources));
+  ASSERT_EQ(SERVICE_WORKER_OK, database->WriteRegistration(data, resources));
 
   EXPECT_EQ(SERVICE_WORKER_OK, database->ReadDatabaseVersion(&db_version));
   EXPECT_LT(0, db_version);
@@ -151,7 +151,7 @@ TEST(ServiceWorkerDatabaseTest, GetNextAvailableIds) {
   data1.scope = URL(origin, "/foo");
   data1.script = URL(origin, "/script1.js");
   data1.version_id = 200;
-  ASSERT_TRUE(database->WriteRegistration(data1, resources));
+  ASSERT_EQ(SERVICE_WORKER_OK, database->WriteRegistration(data1, resources));
 
   EXPECT_EQ(SERVICE_WORKER_OK, database->GetNextAvailableIds(
       &ids.reg_id, &ids.ver_id, &ids.res_id));
@@ -166,7 +166,7 @@ TEST(ServiceWorkerDatabaseTest, GetNextAvailableIds) {
   data2.scope = URL(origin, "/bar");
   data2.script = URL(origin, "/script2.js");
   data2.version_id = 20;
-  ASSERT_TRUE(database->WriteRegistration(data2, resources));
+  ASSERT_EQ(SERVICE_WORKER_OK, database->WriteRegistration(data2, resources));
 
   // Close and reopen the database to verify the stored values.
   database.reset(CreateDatabase(database_dir.path()));
@@ -193,7 +193,7 @@ TEST(ServiceWorkerDatabaseTest, GetOriginsWithRegistrations) {
   data1.scope = URL(origin1, "/foo");
   data1.script = URL(origin1, "/script1.js");
   data1.version_id = 456;
-  ASSERT_TRUE(database->WriteRegistration(data1, resources));
+  ASSERT_EQ(SERVICE_WORKER_OK, database->WriteRegistration(data1, resources));
 
   GURL origin2("https://www.example.com");
   RegistrationData data2;
@@ -201,7 +201,7 @@ TEST(ServiceWorkerDatabaseTest, GetOriginsWithRegistrations) {
   data2.scope = URL(origin2, "/bar");
   data2.script = URL(origin2, "/script2.js");
   data2.version_id = 567;
-  ASSERT_TRUE(database->WriteRegistration(data2, resources));
+  ASSERT_EQ(SERVICE_WORKER_OK, database->WriteRegistration(data2, resources));
 
   GURL origin3("https://example.org");
   RegistrationData data3;
@@ -209,7 +209,7 @@ TEST(ServiceWorkerDatabaseTest, GetOriginsWithRegistrations) {
   data3.scope = URL(origin3, "/hoge");
   data3.script = URL(origin3, "/script3.js");
   data3.version_id = 678;
-  ASSERT_TRUE(database->WriteRegistration(data3, resources));
+  ASSERT_EQ(SERVICE_WORKER_OK, database->WriteRegistration(data3, resources));
 
   // |origin3| has two registrations.
   RegistrationData data4;
@@ -217,7 +217,7 @@ TEST(ServiceWorkerDatabaseTest, GetOriginsWithRegistrations) {
   data4.scope = URL(origin3, "/fuga");
   data4.script = URL(origin3, "/script4.js");
   data4.version_id = 789;
-  ASSERT_TRUE(database->WriteRegistration(data4, resources));
+  ASSERT_EQ(SERVICE_WORKER_OK, database->WriteRegistration(data4, resources));
 
   origins.clear();
   EXPECT_EQ(SERVICE_WORKER_OK, database->GetOriginsWithRegistrations(&origins));
@@ -228,7 +228,8 @@ TEST(ServiceWorkerDatabaseTest, GetOriginsWithRegistrations) {
 
   // |origin3| has another registration, so should not remove it from the
   // unique origin list.
-  ASSERT_TRUE(database->DeleteRegistration(data4.registration_id, origin3));
+  ASSERT_EQ(SERVICE_WORKER_OK,
+            database->DeleteRegistration(data4.registration_id, origin3));
 
   origins.clear();
   EXPECT_EQ(SERVICE_WORKER_OK, database->GetOriginsWithRegistrations(&origins));
@@ -238,7 +239,8 @@ TEST(ServiceWorkerDatabaseTest, GetOriginsWithRegistrations) {
   EXPECT_TRUE(ContainsKey(origins, origin3));
 
   // |origin3| should be removed from the unique origin list.
-  ASSERT_TRUE(database->DeleteRegistration(data3.registration_id, origin3));
+  ASSERT_EQ(SERVICE_WORKER_OK,
+            database->DeleteRegistration(data3.registration_id, origin3));
 
   origins.clear();
   EXPECT_EQ(SERVICE_WORKER_OK, database->GetOriginsWithRegistrations(&origins));
@@ -266,21 +268,21 @@ TEST(ServiceWorkerDatabaseTest, GetRegistrationsForOrigin) {
   data1.scope = URL(origin1, "/foo");
   data1.script = URL(origin1, "/script1.js");
   data1.version_id = 1000;
-  ASSERT_TRUE(database->WriteRegistration(data1, resources));
+  ASSERT_EQ(SERVICE_WORKER_OK, database->WriteRegistration(data1, resources));
 
   RegistrationData data2;
   data2.registration_id = 200;
   data2.scope = URL(origin2, "/bar");
   data2.script = URL(origin2, "/script2.js");
   data2.version_id = 2000;
-  ASSERT_TRUE(database->WriteRegistration(data2, resources));
+  ASSERT_EQ(SERVICE_WORKER_OK, database->WriteRegistration(data2, resources));
 
   RegistrationData data3;
   data3.registration_id = 300;
   data3.scope = URL(origin3, "/hoge");
   data3.script = URL(origin3, "/script3.js");
   data3.version_id = 3000;
-  ASSERT_TRUE(database->WriteRegistration(data3, resources));
+  ASSERT_EQ(SERVICE_WORKER_OK, database->WriteRegistration(data3, resources));
 
   // |origin3| has two registrations.
   RegistrationData data4;
@@ -288,7 +290,7 @@ TEST(ServiceWorkerDatabaseTest, GetRegistrationsForOrigin) {
   data4.scope = URL(origin3, "/fuga");
   data4.script = URL(origin3, "/script4.js");
   data4.version_id = 4000;
-  ASSERT_TRUE(database->WriteRegistration(data4, resources));
+  ASSERT_EQ(SERVICE_WORKER_OK, database->WriteRegistration(data4, resources));
 
   registrations.clear();
   EXPECT_EQ(SERVICE_WORKER_OK,
@@ -314,7 +316,7 @@ TEST(ServiceWorkerDatabaseTest, GetAllRegistrations) {
   data1.scope = URL(origin1, "/foo");
   data1.script = URL(origin1, "/script1.js");
   data1.version_id = 1000;
-  ASSERT_TRUE(database->WriteRegistration(data1, resources));
+  ASSERT_EQ(SERVICE_WORKER_OK, database->WriteRegistration(data1, resources));
 
   GURL origin2("http://www2.example.com");
   RegistrationData data2;
@@ -322,7 +324,7 @@ TEST(ServiceWorkerDatabaseTest, GetAllRegistrations) {
   data2.scope = URL(origin2, "/bar");
   data2.script = URL(origin2, "/script2.js");
   data2.version_id = 2000;
-  ASSERT_TRUE(database->WriteRegistration(data2, resources));
+  ASSERT_EQ(SERVICE_WORKER_OK, database->WriteRegistration(data2, resources));
 
   GURL origin3("http://www3.example.com");
   RegistrationData data3;
@@ -330,7 +332,7 @@ TEST(ServiceWorkerDatabaseTest, GetAllRegistrations) {
   data3.scope = URL(origin3, "/hoge");
   data3.script = URL(origin3, "/script3.js");
   data3.version_id = 3000;
-  ASSERT_TRUE(database->WriteRegistration(data3, resources));
+  ASSERT_EQ(SERVICE_WORKER_OK, database->WriteRegistration(data3, resources));
 
   // |origin3| has two registrations.
   RegistrationData data4;
@@ -338,7 +340,7 @@ TEST(ServiceWorkerDatabaseTest, GetAllRegistrations) {
   data4.scope = URL(origin3, "/fuga");
   data4.script = URL(origin3, "/script4.js");
   data4.version_id = 4000;
-  ASSERT_TRUE(database->WriteRegistration(data4, resources));
+  ASSERT_EQ(SERVICE_WORKER_OK, database->WriteRegistration(data4, resources));
 
   registrations.clear();
   EXPECT_EQ(SERVICE_WORKER_OK,
@@ -374,12 +376,12 @@ TEST(ServiceWorkerDatabaseTest, Registration_Basic) {
   EXPECT_TRUE(database->GetUncommittedResourceIds(&uncommitted_ids_out));
   EXPECT_EQ(uncommitted_ids, uncommitted_ids_out);
 
-  EXPECT_TRUE(database->WriteRegistration(data, resources));
+  EXPECT_EQ(SERVICE_WORKER_OK, database->WriteRegistration(data, resources));
 
   // Make sure that the registration and resource records are stored.
   RegistrationData data_out;
   std::vector<Resource> resources_out;
-  EXPECT_TRUE(database->ReadRegistration(
+  EXPECT_EQ(SERVICE_WORKER_OK, database->ReadRegistration(
       data.registration_id, origin, &data_out, &resources_out));
   VerifyRegistrationData(data, data_out);
   VerifyResourceRecords(resources, resources_out);
@@ -389,11 +391,12 @@ TEST(ServiceWorkerDatabaseTest, Registration_Basic) {
   EXPECT_TRUE(database->GetUncommittedResourceIds(&uncommitted_ids_out));
   EXPECT_TRUE(uncommitted_ids_out.empty());
 
-  EXPECT_TRUE(database->DeleteRegistration(data.registration_id, origin));
+  EXPECT_EQ(SERVICE_WORKER_OK,
+            database->DeleteRegistration(data.registration_id, origin));
 
   // Make sure that the registration and resource records are gone.
   resources_out.clear();
-  EXPECT_FALSE(database->ReadRegistration(
+  EXPECT_EQ(SERVICE_WORKER_ERROR_NOT_FOUND, database->ReadRegistration(
       data.registration_id, origin, &data_out, &resources_out));
   EXPECT_TRUE(resources_out.empty());
 
@@ -419,12 +422,12 @@ TEST(ServiceWorkerDatabaseTest, Registration_Overwrite) {
   resources1.push_back(CreateResource(1, URL(origin, "/resource1")));
   resources1.push_back(CreateResource(2, URL(origin, "/resource2")));
 
-  EXPECT_TRUE(database->WriteRegistration(data, resources1));
+  EXPECT_EQ(SERVICE_WORKER_OK, database->WriteRegistration(data, resources1));
 
   // Make sure that the registration and resource records are stored.
   RegistrationData data_out;
   std::vector<Resource> resources_out;
-  EXPECT_TRUE(database->ReadRegistration(
+  EXPECT_EQ(SERVICE_WORKER_OK, database->ReadRegistration(
       data.registration_id, origin, &data_out, &resources_out));
   VerifyRegistrationData(data, data_out);
   VerifyResourceRecords(resources1, resources_out);
@@ -436,12 +439,13 @@ TEST(ServiceWorkerDatabaseTest, Registration_Overwrite) {
   resources2.push_back(CreateResource(3, URL(origin, "/resource3")));
   resources2.push_back(CreateResource(4, URL(origin, "/resource4")));
 
-  EXPECT_TRUE(database->WriteRegistration(updated_data, resources2));
+  EXPECT_EQ(SERVICE_WORKER_OK,
+            database->WriteRegistration(updated_data, resources2));
 
   // Make sure that |updated_data| is stored and resources referred from |data|
   // is moved to the purgeable list.
   resources_out.clear();
-  EXPECT_TRUE(database->ReadRegistration(
+  EXPECT_EQ(SERVICE_WORKER_OK, database->ReadRegistration(
       updated_data.registration_id, origin, &data_out, &resources_out));
   VerifyRegistrationData(updated_data, data_out);
   VerifyResourceRecords(resources2, resources_out);
@@ -467,7 +471,7 @@ TEST(ServiceWorkerDatabaseTest, Registration_Multiple) {
   std::vector<Resource> resources1;
   resources1.push_back(CreateResource(1, URL(origin, "/resource1")));
   resources1.push_back(CreateResource(2, URL(origin, "/resource2")));
-  EXPECT_TRUE(database->WriteRegistration(data1, resources1));
+  EXPECT_EQ(SERVICE_WORKER_OK, database->WriteRegistration(data1, resources1));
 
   // Add registration2.
   RegistrationData data2;
@@ -479,19 +483,19 @@ TEST(ServiceWorkerDatabaseTest, Registration_Multiple) {
   std::vector<Resource> resources2;
   resources2.push_back(CreateResource(3, URL(origin, "/resource3")));
   resources2.push_back(CreateResource(4, URL(origin, "/resource4")));
-  EXPECT_TRUE(database->WriteRegistration(data2, resources2));
+  EXPECT_EQ(SERVICE_WORKER_OK, database->WriteRegistration(data2, resources2));
 
   // Make sure that registration1 is stored.
   RegistrationData data_out;
   std::vector<Resource> resources_out;
-  EXPECT_TRUE(database->ReadRegistration(
+  EXPECT_EQ(SERVICE_WORKER_OK, database->ReadRegistration(
       data1.registration_id, origin, &data_out, &resources_out));
   VerifyRegistrationData(data1, data_out);
   VerifyResourceRecords(resources1, resources_out);
 
   // Make sure that registration2 is also stored.
   resources_out.clear();
-  EXPECT_TRUE(database->ReadRegistration(
+  EXPECT_EQ(SERVICE_WORKER_OK, database->ReadRegistration(
       data2.registration_id, origin, &data_out, &resources_out));
   VerifyRegistrationData(data2, data_out);
   VerifyResourceRecords(resources2, resources_out);
@@ -501,11 +505,12 @@ TEST(ServiceWorkerDatabaseTest, Registration_Multiple) {
   EXPECT_TRUE(purgeable_ids_out.empty());
 
   // Delete registration1.
-  EXPECT_TRUE(database->DeleteRegistration(data1.registration_id, origin));
+  EXPECT_EQ(SERVICE_WORKER_OK,
+            database->DeleteRegistration(data1.registration_id, origin));
 
   // Make sure that registration1 is gone.
   resources_out.clear();
-  EXPECT_FALSE(database->ReadRegistration(
+  EXPECT_EQ(SERVICE_WORKER_ERROR_NOT_FOUND, database->ReadRegistration(
       data1.registration_id, origin, &data_out, &resources_out));
   EXPECT_TRUE(resources_out.empty());
 
@@ -517,7 +522,7 @@ TEST(ServiceWorkerDatabaseTest, Registration_Multiple) {
 
   // Make sure that registration2 is still alive.
   resources_out.clear();
-  EXPECT_TRUE(database->ReadRegistration(
+  EXPECT_EQ(SERVICE_WORKER_OK, database->ReadRegistration(
       data2.registration_id, origin, &data_out, &resources_out));
   VerifyRegistrationData(data2, data_out);
   VerifyResourceRecords(resources2, resources_out);
@@ -614,7 +619,7 @@ TEST(ServiceWorkerDatabaseTest, DeleteAllDataForOrigin) {
   std::vector<Resource> resources1;
   resources1.push_back(CreateResource(1, URL(origin1, "/resource1")));
   resources1.push_back(CreateResource(2, URL(origin1, "/resource2")));
-  ASSERT_TRUE(database->WriteRegistration(data1, resources1));
+  ASSERT_EQ(SERVICE_WORKER_OK, database->WriteRegistration(data1, resources1));
 
   RegistrationData data2;
   data2.registration_id = 11;
@@ -625,7 +630,7 @@ TEST(ServiceWorkerDatabaseTest, DeleteAllDataForOrigin) {
   std::vector<Resource> resources2;
   resources2.push_back(CreateResource(3, URL(origin1, "/resource3")));
   resources2.push_back(CreateResource(4, URL(origin1, "/resource4")));
-  ASSERT_TRUE(database->WriteRegistration(data2, resources2));
+  ASSERT_EQ(SERVICE_WORKER_OK, database->WriteRegistration(data2, resources2));
 
   // |origin2| has one registration.
   RegistrationData data3;
@@ -637,9 +642,9 @@ TEST(ServiceWorkerDatabaseTest, DeleteAllDataForOrigin) {
   std::vector<Resource> resources3;
   resources3.push_back(CreateResource(5, URL(origin2, "/resource5")));
   resources3.push_back(CreateResource(6, URL(origin2, "/resource6")));
-  ASSERT_TRUE(database->WriteRegistration(data3, resources3));
+  ASSERT_EQ(SERVICE_WORKER_OK, database->WriteRegistration(data3, resources3));
 
-  EXPECT_TRUE(database->DeleteAllDataForOrigin(origin1));
+  EXPECT_EQ(SERVICE_WORKER_OK, database->DeleteAllDataForOrigin(origin1));
 
   // |origin1| should be removed from the unique origin list.
   std::set<GURL> unique_origins;
@@ -657,7 +662,7 @@ TEST(ServiceWorkerDatabaseTest, DeleteAllDataForOrigin) {
   // The registration for |origin2| should not be removed.
   RegistrationData data_out;
   std::vector<Resource> resources_out;
-  EXPECT_TRUE(database->ReadRegistration(
+  EXPECT_EQ(SERVICE_WORKER_OK, database->ReadRegistration(
       data3.registration_id, origin2, &data_out, &resources_out));
   VerifyRegistrationData(data3, data_out);
   VerifyResourceRecords(resources3, resources_out);