Revert of Use a new Supplement constructor for ServiceWorkerRegistration supplements

third_party/WebKit/Source/modules/payments/PaymentAppServiceWorkerRegistration.cpp

 // Copyright 2016 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 "modules/payments/PaymentAppServiceWorkerRegistration.h"
 
 #include "bindings/core/v8/ScriptState.h"
 #include "core/dom/Document.h"
 #include "modules/payments/PaymentAppManager.h"
 #include "modules/serviceworkers/ServiceWorkerRegistration.h"
 
 namespace blink {
 
 PaymentAppServiceWorkerRegistration::~PaymentAppServiceWorkerRegistration() {}
 
 // static
 PaymentAppServiceWorkerRegistration& PaymentAppServiceWorkerRegistration::from(
     ServiceWorkerRegistration& registration) {
   PaymentAppServiceWorkerRegistration* supplement =
       static_cast<PaymentAppServiceWorkerRegistration*>(
           Supplement<ServiceWorkerRegistration>::from(registration,
                                                       supplementName()));
 
   if (!supplement) {
-    supplement = new PaymentAppServiceWorkerRegistration(registration);
+    supplement = new PaymentAppServiceWorkerRegistration(&registration);
     provideTo(registration, supplementName(), supplement);
   }
 
   return *supplement;
 }
 
 // static
 PaymentAppManager* PaymentAppServiceWorkerRegistration::paymentAppManager(
     ScriptState* scriptState,
     ServiceWorkerRegistration& registration) {
   return PaymentAppServiceWorkerRegistration::from(registration)
       .paymentAppManager(scriptState);
 }
 
 PaymentAppManager* PaymentAppServiceWorkerRegistration::paymentAppManager(
     ScriptState* scriptState) {
   if (!m_paymentAppManager) {
-    m_paymentAppManager = PaymentAppManager::create(supplementable());
+    m_paymentAppManager = PaymentAppManager::create(m_registration);
   }
   return m_paymentAppManager.get();
 }
 
 DEFINE_TRACE(PaymentAppServiceWorkerRegistration) {
+  visitor->trace(m_registration);
   visitor->trace(m_paymentAppManager);
   Supplement<ServiceWorkerRegistration>::trace(visitor);
 }
 
 PaymentAppServiceWorkerRegistration::PaymentAppServiceWorkerRegistration(
-    ServiceWorkerRegistration& registration)
-    : Supplement<ServiceWorkerRegistration>(registration) {}
+    ServiceWorkerRegistration* registration)
+    : m_registration(registration) {}
 
 // static
 const char* PaymentAppServiceWorkerRegistration::supplementName() {
   return "PaymentAppServiceWorkerRegistration";
 }
 
 }  // namespace blink