Use a new Supplement constructor in ServiceWorkerContainer

We're deprecating the default constructor of Supplement.

BUG=610176

Review-Url: https://codereview.chromium.org/2619543002
Cr-Commit-Position: refs/heads/master@{#441922}

third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerContainerClient.cpp

@@ -14,14 +14,15 @@
 
 namespace blink {
 
-ServiceWorkerContainerClient* ServiceWorkerContainerClient::create(
-    std::unique_ptr<WebServiceWorkerProvider> provider) {
-  return new ServiceWorkerContainerClient(std::move(provider));
-}
+ServiceWorkerContainerClient::ServiceWorkerContainerClient(
+    Document& document,
+    std::unique_ptr<WebServiceWorkerProvider> provider)
+    : Supplement<Document>(document), m_provider(std::move(provider)) {}
 
 ServiceWorkerContainerClient::ServiceWorkerContainerClient(
+    WorkerClients& clients,
     std::unique_ptr<WebServiceWorkerProvider> provider)
-    : m_provider(std::move(provider)) {}
+    : Supplement<WorkerClients>(clients), m_provider(std::move(provider)) {}
 
 ServiceWorkerContainerClient::~ServiceWorkerContainerClient() {}
 
@@ -34,10 +35,13 @@ ServiceWorkerContainerClient* ServiceWorkerContainerClient::from(
   if (!context)
     return nullptr;
   if (context->isWorkerGlobalScope()) {
-    WorkerClients* clients = toWorkerGlobalScope(context)->clients();
-    ASSERT(clients);
-    return static_cast<ServiceWorkerContainerClient*>(
-        Supplement<WorkerClients>::from(clients, supplementName()));
+    WorkerClients* workerClients = toWorkerGlobalScope(context)->clients();
+    DCHECK(workerClients);
+    ServiceWorkerContainerClient* client =
+        static_cast<ServiceWorkerContainerClient*>(
+            Supplement<WorkerClients>::from(workerClients, supplementName()));
+    DCHECK(client);
+    return client;
   }
   Document* document = toDocument(context);
   if (!document->frame())
@@ -48,6 +52,7 @@ ServiceWorkerContainerClient* ServiceWorkerContainerClient::from(
           Supplement<Document>::from(document, supplementName()));
   if (!client) {
     client = new ServiceWorkerContainerClient(
+        *document,
         document->frame()->loader().client()->createServiceWorkerProvider());
     Supplement<Document>::provideTo(*document, supplementName(), client);
   }
@@ -59,7 +64,7 @@ void provideServiceWorkerContainerClientToWorker(
     std::unique_ptr<WebServiceWorkerProvider> provider) {
   clients->provideSupplement(
       ServiceWorkerContainerClient::supplementName(),
-      ServiceWorkerContainerClient::create(std::move(provider)));
+      new ServiceWorkerContainerClient(*clients, std::move(provider)));
 }
 
 }  // namespace blink

third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerContainerClient.h

@@ -26,8 +26,10 @@ class MODULES_EXPORT ServiceWorkerContainerClient final
   WTF_MAKE_NONCOPYABLE(ServiceWorkerContainerClient);
 
  public:
-  static ServiceWorkerContainerClient* create(
-      std::unique_ptr<WebServiceWorkerProvider>);
+  ServiceWorkerContainerClient(Document&,
+                               std::unique_ptr<WebServiceWorkerProvider>);
+  ServiceWorkerContainerClient(WorkerClients&,
+                               std::unique_ptr<WebServiceWorkerProvider>);
   virtual ~ServiceWorkerContainerClient();
 
   WebServiceWorkerProvider* provider() { return m_provider.get(); }
@@ -40,10 +42,7 @@ class MODULES_EXPORT ServiceWorkerContainerClient final
     Supplement<WorkerClients>::trace(visitor);
   }
 
- protected:
-  explicit ServiceWorkerContainerClient(
-      std::unique_ptr<WebServiceWorkerProvider>);
-
+ private:
   std::unique_ptr<WebServiceWorkerProvider> m_provider;
 };
 

third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerContainerTest.cpp

@@ -162,7 +162,8 @@ class ServiceWorkerContainerTest : public ::testing::Test {
   void provide(std::unique_ptr<WebServiceWorkerProvider> provider) {
     Supplement<Document>::provideTo(
         m_page->document(), ServiceWorkerContainerClient::supplementName(),
-        ServiceWorkerContainerClient::create(std::move(provider)));
+        new ServiceWorkerContainerClient(m_page->document(),
+                                         std::move(provider)));
   }
 
   void setPageURL(const String& url) {