Revert "Add ServiceWorkerStorageControl::UpdateToActiveState()"

This reverts commit d69aec62.

Reason for revert:

Findit (https://goo.gl/kROfz5) identified CL at revision 759540 as the
culprit for failures in the build cycles as shown on:
https://analysis.chromium.org/waterfall/culprit?key=ag9zfmZpbmRpdC1mb3ItbWVyRAsSDVdmU3VzcGVjdGVkQ0wiMWNocm9taXVtL2Q2OWFlYzYyZjkyY2QyMDY2MTE0ZTBkMWFmNGUwODk5MzU3NTUxMmQM

Sample Failed Build: https://ci.chromium.org/b/8882888412342833920

Sample Failed Step: compile

Original change's description:
> Add ServiceWorkerStorageControl::UpdateToActiveState()
> 
> This is a wrapper of ServiceWorkerStorage::UpdateToActiveState().
> 
> Bug: 1055677
> Change-Id: I1444227429fd4c4647198702db79b0d414514571
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2147983
> Reviewed-by: Makoto Shimazu <shimazu@chromium.org>
> Reviewed-by: Kinuko Yasuda <kinuko@chromium.org>
> Commit-Queue: Kenichi Ishibashi <bashi@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#759540}


Change-Id: I7b8266d5bc681ca86618ab2993efab0a42a396d8
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1055677
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2152213
Cr-Commit-Position: refs/heads/master@{#759546}

components/services/storage/public/mojom/service_worker_storage_control.mojom

@@ -112,10 +112,6 @@ interface ServiceWorkerStorageControl {
       (ServiceWorkerDatabaseStatus status,
        ServiceWorkerStorageOriginState origin_state);
 
-  // Updates the state of the registration's stored version to active.
-  UpdateToActiveState(int64 registration_id, url.mojom.Url origin) =>
-      (ServiceWorkerDatabaseStatus status);
-
   // Returns a new registration id which is guaranteed to be unique in the
   // storage. Returns blink::mojom::kInvalidServiceWorkerRegistrationId if the
   // storage is disabled.

content/browser/service_worker/service_worker_storage_control_impl.cc

@@ -169,13 +169,6 @@ void ServiceWorkerStorageControlImpl::DeleteRegistration(
       base::BindOnce(&DidDeleteRegistration, std::move(callback)));
 }
 
-void ServiceWorkerStorageControlImpl::UpdateToActiveState(
-    int64_t registration_id,
-    const GURL& origin,
-    UpdateToActiveStateCallback callback) {
-  storage_->UpdateToActiveState(registration_id, origin, std::move(callback));
-}
-
 void ServiceWorkerStorageControlImpl::GetNewRegistrationId(
     GetNewRegistrationIdCallback callback) {
   storage_->GetNewRegistrationId(std::move(callback));

content/browser/service_worker/service_worker_storage_control_impl.h

@@ -55,9 +55,6 @@ class CONTENT_EXPORT ServiceWorkerStorageControlImpl
   void DeleteRegistration(int64_t registration_id,
                           const GURL& origin,
                           DeleteRegistrationCallback callback) override;
-  void UpdateToActiveState(int64_t registration_id,
-                           const GURL& origin,
-                           UpdateToActiveStateCallback callback) override;
   void GetNewRegistrationId(GetNewRegistrationIdCallback callback) override;
   void GetNewVersionId(GetNewVersionIdCallback callback) override;
   void GetNewResourceId(GetNewResourceIdCallback callback) override;

content/browser/service_worker/service_worker_storage_control_impl_unittest.cc

@@ -262,20 +262,6 @@ class ServiceWorkerStorageControlImplTest : public testing::Test {
     return result;
   }
 
-  DatabaseStatus UpdateToActiveState(int64_t registration_id,
-                                     const GURL& origin) {
-    DatabaseStatus out_status;
-    base::RunLoop loop;
-    storage()->UpdateToActiveState(
-        registration_id, origin,
-        base::BindLambdaForTesting([&](DatabaseStatus status) {
-          out_status = status;
-          loop.Quit();
-        }));
-    loop.Run();
-    return out_status;
-  }
-
   int64_t GetNewRegistrationId() {
     int64_t return_value;
     base::RunLoop loop;
@@ -456,7 +442,6 @@ class ServiceWorkerStorageControlImplTest : public testing::Test {
 
   // Create a registration with a single resource and stores the registration.
   DatabaseStatus CreateAndStoreRegistration(int64_t registration_id,
-                                            int64_t version_id,
                                             const GURL& scope,
                                             const GURL& script_url,
                                             int64_t script_size) {
@@ -466,7 +451,6 @@ class ServiceWorkerStorageControlImplTest : public testing::Test {
 
     auto data = storage::mojom::ServiceWorkerRegistrationData::New();
     data->registration_id = registration_id;
-    data->version_id = version_id;
     data->scope = scope;
     data->script = script_url;
     data->navigation_preload_state =
@@ -615,41 +599,6 @@ TEST_F(ServiceWorkerStorageControlImplTest, StoreAndDeleteRegistration) {
   }
 }
 
-TEST_F(ServiceWorkerStorageControlImplTest, UpdateToActiveState) {
-  const GURL kScope("https://www.example.com/");
-  const GURL kScriptUrl("https://www.example.com/sw.js");
-  const int64_t kScriptSize = 10;
-
-  LazyInitializeForTest();
-
-  // Preparation: Store a registration.
-  const int64_t registration_id = GetNewRegistrationId();
-  const int64_t version_id = GetNewVersionId();
-  DatabaseStatus status = CreateAndStoreRegistration(
-      registration_id, version_id, kScope, kScriptUrl, kScriptSize);
-  ASSERT_EQ(status, DatabaseStatus::kOk);
-
-  // The stored registration shouldn't be activated yet.
-  {
-    FindRegistrationResult result =
-        FindRegistrationForId(registration_id, kScope.GetOrigin());
-    ASSERT_EQ(result->status, DatabaseStatus::kOk);
-    EXPECT_FALSE(result->registration->is_active);
-  }
-
-  // Set the registration is active in storage.
-  status = UpdateToActiveState(registration_id, kScope.GetOrigin());
-  ASSERT_EQ(status, DatabaseStatus::kOk);
-
-  // Now the stored registration should be active.
-  {
-    FindRegistrationResult result =
-        FindRegistrationForId(registration_id, kScope.GetOrigin());
-    ASSERT_EQ(result->status, DatabaseStatus::kOk);
-    EXPECT_TRUE(result->registration->is_active);
-  }
-}
-
 // Tests that getting registrations works.
 TEST_F(ServiceWorkerStorageControlImplTest, GetRegistrationsForOrigin) {
   const GURL kScope1("https://www.example.com/foo/");
@@ -663,14 +612,12 @@ TEST_F(ServiceWorkerStorageControlImplTest, GetRegistrationsForOrigin) {
   // Store two registrations which have the same origin.
   DatabaseStatus status;
   const int64_t registration_id1 = GetNewRegistrationId();
-  const int64_t version_id1 = GetNewVersionId();
-  status = CreateAndStoreRegistration(registration_id1, version_id1, kScope1,
-                                      kScriptUrl1, kScriptSize);
+  status = CreateAndStoreRegistration(registration_id1, kScope1, kScriptUrl1,
+                                      kScriptSize);
   ASSERT_EQ(status, DatabaseStatus::kOk);
   const int64_t registration_id2 = GetNewRegistrationId();
-  const int64_t version_id2 = GetNewVersionId();
-  status = CreateAndStoreRegistration(registration_id2, version_id2, kScope2,
-                                      kScriptUrl2, kScriptSize);
+  status = CreateAndStoreRegistration(registration_id2, kScope2, kScriptUrl2,
+                                      kScriptSize);
   ASSERT_EQ(status, DatabaseStatus::kOk);
 
   // Get registrations for the origin.
@@ -795,10 +742,9 @@ TEST_F(ServiceWorkerStorageControlImplTest, StoreAndGetUserData) {
   LazyInitializeForTest();
 
   const int64_t registration_id = GetNewRegistrationId();
-  const int64_t version_id = GetNewVersionId();
   DatabaseStatus status;
-  status = CreateAndStoreRegistration(registration_id, version_id, kScope,
-                                      kScriptUrl, kScriptSize);
+  status = CreateAndStoreRegistration(registration_id, kScope, kScriptUrl,
+                                      kScriptSize);
   ASSERT_EQ(status, DatabaseStatus::kOk);
 
   // Store user data with two entries.
@@ -854,14 +800,13 @@ TEST_F(ServiceWorkerStorageControlImplTest, StoreAndGetUserData) {
   // Delete the registration and store a new registration for the same
   // scope.
   const int64_t new_registration_id = GetNewRegistrationId();
-  const int64_t new_version_id = GetNewVersionId();
   {
     DeleteRegistrationResult result =
         DeleteRegistration(registration_id, kScope.GetOrigin());
     ASSERT_EQ(result.status, DatabaseStatus::kOk);
 
-    status = CreateAndStoreRegistration(new_registration_id, new_version_id,
-                                        kScope, kScriptUrl, kScriptSize);
+    status = CreateAndStoreRegistration(new_registration_id, kScope, kScriptUrl,
+                                        kScriptSize);
     ASSERT_EQ(status, DatabaseStatus::kOk);
   }
 
@@ -883,10 +828,9 @@ TEST_F(ServiceWorkerStorageControlImplTest, StoreAndGetUserDataByKeyPrefix) {
   LazyInitializeForTest();
 
   const int64_t registration_id = GetNewRegistrationId();
-  const int64_t version_id = GetNewVersionId();
   DatabaseStatus status;
-  status = CreateAndStoreRegistration(registration_id, version_id, kScope,
-                                      kScriptUrl, kScriptSize);
+  status = CreateAndStoreRegistration(registration_id, kScope, kScriptUrl,
+                                      kScriptSize);
   ASSERT_EQ(status, DatabaseStatus::kOk);
 
   // Store some user data with prefixes.