PaymentApp: Remove scope_url parameter from Get/SetManifest methods.

third_party/WebKit/Source/modules/payments/PaymentAppManager.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/PaymentAppManager.h"
 
 #include "bindings/core/v8/ScriptPromise.h"
 #include "bindings/core/v8/ScriptState.h"
 #include "core/dom/DOMException.h"
 #include "modules/payments/PaymentAppManifest.h"
@@ skipping 83 matching lines @@
   if (!m_manager) {
     return ScriptPromise::rejectWithDOMException(
         scriptState, DOMException::create(InvalidStateError,
                                           "Payment app manager unavailable."));
   }
 
   ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState);
   ScriptPromise promise = resolver->promise();
 
   m_manager->SetManifest(
-      m_registration->scope(),
       payments::mojom::blink::PaymentAppManifest::From(manifest),
       convertToBaseCallback(WTF::bind(&PaymentAppManager::onSetManifest,
                                       wrapPersistent(this),
                                       wrapPersistent(resolver))));
 
   return promise;
 }
 
 ScriptPromise PaymentAppManager::getManifest(ScriptState* scriptState) {
   if (!m_manager) {
     return ScriptPromise::rejectWithDOMException(
         scriptState, DOMException::create(InvalidStateError,
                                           "Payment app manager unavailable."));
   }
 
   ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState);
   ScriptPromise promise = resolver->promise();
 
-  m_manager->GetManifest(m_registration->scope(),
-                         convertToBaseCallback(WTF::bind(
-                             &PaymentAppManager::onGetManifest,
-                             wrapPersistent(this), wrapPersistent(resolver))));
+  m_manager->GetManifest(convertToBaseCallback(
+      WTF::bind(&PaymentAppManager::onGetManifest, wrapPersistent(this),
+                wrapPersistent(resolver))));
 
   return promise;
 }
 
 DEFINE_TRACE(PaymentAppManager) {
   visitor->trace(m_registration);
 }
 
 PaymentAppManager::PaymentAppManager(ServiceWorkerRegistration* registration)
     : m_registration(registration) {
   DCHECK(registration);
   Platform::current()->interfaceProvider()->getInterface(
       mojo::GetProxy(&m_manager));
 
   m_manager.set_connection_error_handler(convertToBaseCallback(WTF::bind(
       &PaymentAppManager::onServiceConnectionError, wrapWeakPersistent(this))));
+
+  m_manager->Init(m_registration->scope());
 }
 
 void PaymentAppManager::onSetManifest(
     ScriptPromiseResolver* resolver,
     payments::mojom::blink::PaymentAppManifestError error) {
   DCHECK(resolver);
   switch (error) {
     case payments::mojom::blink::PaymentAppManifestError::NONE:
       resolver->resolve();
       break;
@@ skipping 39 matching lines @@
 
 void PaymentAppManager::onServiceConnectionError() {
   if (!Platform::current()) {
     return;
   }
 
   m_manager.reset();
 }
 
 }  // namespace blink