[Payments] Remove country from shipping label in bottom and fullsheet.

chrome/android/java/src/org/chromium/chrome/browser/payments/ui/PaymentOption.java

Index: chrome/android/java/src/org/chromium/chrome/browser/payments/ui/PaymentOption.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/PaymentOption.java b/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/PaymentOption.java
index 0a6a63a71613789a07c09588477a0b1aaa632a2e..54a566dd53e1a917068792ef97b3dcca43dc0c8f 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/PaymentOption.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/PaymentOption.java
@@ -13,6 +13,20 @@ import javax.annotation.Nullable;
  * method.
  */
 public class PaymentOption implements Completable {
+    /**
+     * Observer to be notified when the view containing a PaymentOption changes focus state.
+     */
+    public interface OptionSectionFocusChangedDelegate {

[please use gerrit instead, 2016/11/23 21:40:50]

Observers are usually named *Observer. The differences are many and at times
subtle. One way distinguish: observers are optional, delegates are required.

Also, observer interfaces should be defined in the class that's firing the
event. OptionSection would be the best. Then you could name this interface
FocusChangedObserver.

[sebsg, 2016/11/25 15:55:20]

Done.

+        /*
+         * Called when a view that lists payment options gets or loses focus.
+         *
+         * @param dataType  The type of the data contained in the section.
+         * @param willFocus Whether the section is getting the focus.
+         */
+        void onOptionSectionFocusChanged(
+                @PaymentRequestUI.DataType int dataType, boolean willFocus);
+    }
+
     protected boolean mIsComplete;
     protected boolean mIsEditable;
     protected String mEditMessage;