Add country combobox to change country and rebuild address inputs.

chrome/chrome_browser_ui.gypi

Index: chrome/chrome_browser_ui.gypi
diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi
index 4828ab68bfcca1aa68bc6778776fbf8986e85397..4d6405c7887c36dc065c4a59a66a4badb488cd4c 100644
--- a/chrome/chrome_browser_ui.gypi
+++ b/chrome/chrome_browser_ui.gypi
@@ -3100,10 +3100,9 @@
             'browser/ui/window_sizer/window_sizer.h',
 
             # Also not used on android
-            'browser/ui/apps/chrome_shell_window_delegate.cc',
-            'browser/ui/autofill/account_chooser_model.cc',
-            'browser/ui/autofill/autofill_dialog_sign_in_delegate.cc',
             'browser/ui/autofill/country_combobox_model.cc',
+            'browser/ui/autofill/country_combobox_model.h',
+            'browser/ui/apps/chrome_shell_window_delegate.cc',
             'browser/ui/bookmarks/bookmark_drag_drop.cc',
             'browser/ui/bookmarks/bookmark_tab_helper_delegate.cc',
             'browser/ui/browser_content_setting_bubble_model_delegate.cc',
@@ -3367,6 +3366,8 @@
           ],
         }, { # enable_autofill_dialog!=1 or OS=="android"
           'sources!': [
+            'browser/ui/autofill/account_chooser_model.cc',
+            'browser/ui/autofill/account_chooser_model.h',
             'browser/ui/autofill/autofill_dialog_controller_impl.cc',
             'browser/ui/autofill/autofill_dialog_controller_impl.h',
             'browser/ui/autofill/autofill_dialog_i18n_input.cc',
@@ -3374,6 +3375,8 @@
             'browser/ui/autofill/autofill_dialog_view.h',
             'browser/ui/autofill/autofill_dialog_view.cc',
             'browser/ui/autofill/autofill_dialog_view_delegate.h',
+            'browser/ui/autofill/autofill_dialog_sign_in_delegate.cc',
+            'browser/ui/autofill/autofill_dialog_sign_in_delegate.h',
           ],
         }],
         ['enable_google_now==0', {