Chrome does not know the source of the shipment for sure, so let's just remove the country from the view. The user can still verify the country of their shipping address via the "pencil" icon that gogerald@ will be adding.

Hi Hwi, just to be sure, I would remove the country only from this first screenshot? (The one named bottomsheet)

Thanks!

Deleted: BottomSheet.jpg 340 KB

	BottomSheet.jpg 340 KB View Download

Deleted: FullSheet.jpg 299 KB

	FullSheet.jpg 299 KB View Download

Deleted: ExpandedSection.jpg 422 KB

	ExpandedSection.jpg 422 KB View Download

Hi sebsg@ and rouslan@, 
This bug is correct for *bottomsheet*.

On a separate note, I think there was a separate bug to hide the country code from the *fullsheet* as well, and there was also a comment that it should be done in a future milestone. I can't find the bug with such comments :-( or I may remember incorrectly. A desired outcome is hiding country from both bottomsheet and fullsheet for non-international shipping. Do you see any problems? 

Country should still be shown in expanded section.

Hi! Could you please tell me if this is the UI you expected? Thanks!

Deleted: RemoveCountry.mp4 1.2 MB

	RemoveCountry.mp4 1.2 MB View Download

Looks correct, thank you.

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/b9f344d725edb0c6514d6df660ab0236a36f83b4

commit b9f344d725edb0c6514d6df660ab0236a36f83b4
Author: sebsg <sebsg@chromium.org>
Date: Fri Nov 25 19:45:40 2016

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

BUG= 662574 

Review-Url: https://codereview.chromium.org/2526943003
Cr-Commit-Position: refs/heads/master@{#434543}

[modify] https://crrev.com/b9f344d725edb0c6514d6df660ab0236a36f83b4/chrome/android/java/src/org/chromium/chrome/browser/autofill/PersonalDataManager.java
[modify] https://crrev.com/b9f344d725edb0c6514d6df660ab0236a36f83b4/chrome/android/java/src/org/chromium/chrome/browser/payments/AutofillAddress.java
[modify] https://crrev.com/b9f344d725edb0c6514d6df660ab0236a36f83b4/chrome/android/java/src/org/chromium/chrome/browser/payments/CardEditor.java
[modify] https://crrev.com/b9f344d725edb0c6514d6df660ab0236a36f83b4/chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentRequestImpl.java
[modify] https://crrev.com/b9f344d725edb0c6514d6df660ab0236a36f83b4/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/PaymentRequestSection.java
[modify] https://crrev.com/b9f344d725edb0c6514d6df660ab0236a36f83b4/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/PaymentRequestUI.java
[modify] https://crrev.com/b9f344d725edb0c6514d6df660ab0236a36f83b4/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/SectionInformation.java
[modify] https://crrev.com/b9f344d725edb0c6514d6df660ab0236a36f83b4/chrome/android/java_sources.gni
[add] https://crrev.com/b9f344d725edb0c6514d6df660ab0236a36f83b4/chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestShippingAddressTest.java
[modify] https://crrev.com/b9f344d725edb0c6514d6df660ab0236a36f83b4/chrome/browser/autofill/android/personal_data_manager_android.cc
[modify] https://crrev.com/b9f344d725edb0c6514d6df660ab0236a36f83b4/chrome/browser/autofill/android/personal_data_manager_android.h