Merge-60 Select saved region when loaded async in ship addr editor.

chrome/browser/ui/views/payments/shipping_address_editor_view_controller.cc

 // Copyright 2017 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 "chrome/browser/ui/views/payments/shipping_address_editor_view_controller.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/memory/ptr_util.h"
@@ skipping 417 matching lines @@
     return;
   autofill::RegionComboboxModel* model =
       static_cast<autofill::RegionComboboxModel*>(combobox->model());
   if (model->IsPendingRegionDataLoad())
     return;
   if (model->failed_to_load_data()) {
     failed_to_load_region_data_ = true;
     // It is safe to update synchronously since the change comes from the model
     // and not from the UI.
     OnDataChanged(/*synchronous=*/true);
+  } else {
+    base::string16 state_value =
+        GetInitialValueForType(autofill::ADDRESS_HOME_STATE);
+    if (!state_value.empty()) {
+      combobox->SelectValue(state_value);
+      OnPerformAction(combobox);
+    }
   }
 }
 
 bool ShippingAddressEditorViewController::GetSheetId(DialogViewID* sheet_id) {
   *sheet_id = DialogViewID::SHIPPING_ADDRESS_EDITOR_SHEET;
   return true;
 }
 
 ShippingAddressEditorViewController::ShippingAddressValidationDelegate::
     ShippingAddressValidationDelegate(
@@ skipping 82 matching lines @@
     return true;
   }
   if (error_message && field_.required) {
     *error_message = l10n_util::GetStringUTF16(
         IDS_PAYMENTS_FIELD_REQUIRED_VALIDATION_MESSAGE);
   }
   return !field_.required;
 }
 
 }  // namespace payments