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

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

Index: third_party/WebKit/Source/modules/payments/PaymentManager.cpp
diff --git a/third_party/WebKit/Source/modules/payments/PaymentManager.cpp b/third_party/WebKit/Source/modules/payments/PaymentManager.cpp
index 87e75cb7d750e1ae027e67ed384dbc34beda9562..6e2f329c33e6cf0dfc65953ce1d840ddf220b190 100644
--- a/third_party/WebKit/Source/modules/payments/PaymentManager.cpp
+++ b/third_party/WebKit/Source/modules/payments/PaymentManager.cpp
@@ -130,8 +130,9 @@ ScriptPromise PaymentManager::getManifest(ScriptState* script_state) {
 }
 
 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_;
 }