PaymentHandler: Implement set/get methods in PaymentInstruments (blink)

third_party/WebKit/Source/modules/payments/PaymentManager.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/PaymentManager.h"
 
 #include "bindings/core/v8/ScriptPromise.h"
 #include "bindings/core/v8/ScriptState.h"
 #include "core/dom/DOMException.h"
 #include "modules/payments/PaymentAppManifest.h"
@@ skipping 112 matching lines @@
   ScriptPromise promise = resolver->Promise();
 
   manager_->GetManifest(ConvertToBaseCallback(
       WTF::Bind(&PaymentManager::OnGetManifest, WrapPersistent(this),
                 WrapPersistent(resolver))));
 
   return promise;
 }
 
 PaymentInstruments* PaymentManager::instruments() {
-  if (!instruments_)
-    instruments_ = new PaymentInstruments();
+  if (!instruments_) {

[please use gerrit instead, 2017/04/12 19:02:37]

{} is not necessary.

+    instruments_ = new PaymentInstruments(manager_);

[please use gerrit instead, 2017/04/12 19:02:37]

The order of deletion in this object is manager_, instruments_, registration_.
Therefore, you can have an instruments_ object with an invalid reference to
manager_. Please move the instruments_ member variable to be below the manager_
variable in the header to remedy this problem.

[haraken, 2017/04/13 01:32:31]

I don't fully understand what you mean, but a destructor of an Oilpan object is
not allowed to touch any other Oilpan objects (because there's no guarantee
about the order in which they get destructed).

[zino, 2017/04/15 03:30:10]

Done.

Anyway I modified order of declaration in header.

+  }
   return instruments_;
 }
 
 DEFINE_TRACE(PaymentManager) {
   visitor->Trace(registration_);
   visitor->Trace(instruments_);
 }
 
 PaymentManager::PaymentManager(ServiceWorkerRegistration* registration)
     : registration_(registration), instruments_(nullptr) {
@@ skipping 53 matching lines @@
           "No payment app manifest associated with the service worker."));
       break;
   }
 }
 
 void PaymentManager::OnServiceConnectionError() {
   manager_.reset();
 }
 
 }  // namespace blink