Introduce ServiceWorkerRegistrationOptions struct for service worker options

content/browser/service_worker/service_worker_registration_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/service_worker/service_worker_registration.h"
 
 #include <stdint.h>
 #include <utility>
 
 #include "base/files/scoped_temp_dir.h"
@@ skipping 90 matching lines @@
  protected:
   std::unique_ptr<EmbeddedWorkerTestHelper> helper_;
   TestBrowserThreadBundle thread_bundle_;
 };
 
 TEST_F(ServiceWorkerRegistrationTest, SetAndUnsetVersions) {
   const GURL kScope("http://www.example.not/");
   const GURL kScript("http://www.example.not/service_worker.js");
   int64_t kRegistrationId = 1L;
   scoped_refptr<ServiceWorkerRegistration> registration =
-      new ServiceWorkerRegistration(kScope, kRegistrationId,
-                                    context()->AsWeakPtr());
+      new ServiceWorkerRegistration(ServiceWorkerRegistrationOptions(kScope),
+                                    kRegistrationId, context()->AsWeakPtr());
 
   const int64_t version_1_id = 1L;
   const int64_t version_2_id = 2L;
   scoped_refptr<ServiceWorkerVersion> version_1 = new ServiceWorkerVersion(
       registration.get(), kScript, version_1_id, context()->AsWeakPtr());
   scoped_refptr<ServiceWorkerVersion> version_2 = new ServiceWorkerVersion(
       registration.get(), kScript, version_2_id, context()->AsWeakPtr());
 
   RegistrationListener listener;
   registration->AddListener(&listener);
@@ skipping 45 matching lines @@
   EXPECT_EQ(listener.observed_info_.waiting_version.version_id,
             kInvalidServiceWorkerVersionId);
   EXPECT_EQ(listener.observed_info_.installing_version.version_id,
             kInvalidServiceWorkerVersionId);
 }
 
 TEST_F(ServiceWorkerRegistrationTest, FailedRegistrationNoCrash) {
   const GURL kScope("http://www.example.not/");
   int64_t kRegistrationId = 1L;
   scoped_refptr<ServiceWorkerRegistration> registration =
-      new ServiceWorkerRegistration(kScope, kRegistrationId,
-                                    context()->AsWeakPtr());
+      new ServiceWorkerRegistration(ServiceWorkerRegistrationOptions(kScope),
+                                    kRegistrationId, context()->AsWeakPtr());
   std::unique_ptr<ServiceWorkerRegistrationHandle> handle(
       new ServiceWorkerRegistrationHandle(
           context()->AsWeakPtr(), base::WeakPtr<ServiceWorkerProviderHost>(),
           registration.get()));
   registration->NotifyRegistrationFailed();
   // Don't crash when handle gets destructed.
 }
 
 TEST_F(ServiceWorkerRegistrationTest, NavigationPreload) {
   const GURL kScope("http://www.example.not/");
   const GURL kScript("https://www.example.not/service_worker.js");
   // Setup.
   scoped_refptr<ServiceWorkerRegistration> registration =
-      new ServiceWorkerRegistration(kScope, storage()->NewRegistrationId(),
+      new ServiceWorkerRegistration(ServiceWorkerRegistrationOptions(kScope),
+                                    storage()->NewRegistrationId(),
                                     context()->AsWeakPtr());
   scoped_refptr<ServiceWorkerVersion> version_1 = new ServiceWorkerVersion(
       registration.get(), kScript, storage()->NewVersionId(),
       context()->AsWeakPtr());
   version_1->set_fetch_handler_existence(
       ServiceWorkerVersion::FetchHandlerExistence::EXISTS);
   registration->SetActiveVersion(version_1);
   version_1->SetStatus(ServiceWorkerVersion::ACTIVATED);
   scoped_refptr<ServiceWorkerVersion> version_2 = new ServiceWorkerVersion(
       registration.get(), kScript, storage()->NewVersionId(),
@@ skipping 23 matching lines @@
  public:
   ServiceWorkerActivationTest() : ServiceWorkerRegistrationTest() {}
 
   void SetUp() override {
     ServiceWorkerRegistrationTest::SetUp();
 
     const GURL kScope("https://www.example.not/");
     const GURL kScript("https://www.example.not/service_worker.js");
 
     registration_ = new ServiceWorkerRegistration(
-        kScope, storage()->NewRegistrationId(), context()->AsWeakPtr());
+        ServiceWorkerRegistrationOptions(kScope),
+        storage()->NewRegistrationId(), context()->AsWeakPtr());
 
     // Create an active version.
     scoped_refptr<ServiceWorkerVersion> version_1 = new ServiceWorkerVersion(
         registration_.get(), kScript, storage()->NewVersionId(),
         context()->AsWeakPtr());
     version_1->set_fetch_handler_existence(
         ServiceWorkerVersion::FetchHandlerExistence::EXISTS);
     registration_->SetActiveVersion(version_1);
     version_1->SetStatus(ServiceWorkerVersion::ACTIVATED);
 
@@ skipping 249 matching lines @@
   clock_1->Advance(kMaxLameDuckTime + base::TimeDelta::FromSeconds(1));
 
   // Activation should happen by the lame duck timer.
   RunLameDuckTimer();
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(version_2.get(), reg->active_version());
   EXPECT_FALSE(IsLameDuckTimerRunning());
 }
 
 }  // namespace content