Ask libaddressinput for address components to use in requestAutocomplete().

chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc

 // Copyright (c) 2012 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 <map>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/guid.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/prefs/pref_service.h"
 #include "base/run_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/tuple.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_controller_impl.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_view.h"
 #include "chrome/browser/ui/autofill/generated_credit_card_bubble_controller.h"
 #include "chrome/browser/ui/autofill/mock_new_credit_card_bubble_controller.h"
 #include "chrome/browser/ui/autofill/test_generated_credit_card_bubble_controller.h"
+#include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "chrome/test/base/scoped_testing_local_state.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/autofill/content/browser/risk/proto/fingerprint.pb.h"
 #include "components/autofill/content/browser/wallet/full_wallet.h"
 #include "components/autofill/content/browser/wallet/instrument.h"
 #include "components/autofill/content/browser/wallet/mock_wallet_client.h"
@@ skipping 50 matching lines @@
     };
 const char kSettingsOrigin[] = "Chrome settings";
 const char kTestCCNumberAmex[] = "376200000000002";
 const char kTestCCNumberVisa[] = "4111111111111111";
 const char kTestCCNumberMaster[] = "5555555555554444";
 const char kTestCCNumberDiscover[] = "6011111111111117";
 const char kTestCCNumberIncomplete[] = "4111111111";
 // Credit card number fails Luhn check.
 const char kTestCCNumberInvalid[] = "4111111111111112";
 
-// Sets the value of |type| in |outputs| to |value|.
-void SetOutputValue(const DetailInputs& inputs,
-                    ServerFieldType type,
-                    const base::string16& value,
-                    FieldValueMap* outputs) {
-  for (size_t i = 0; i < inputs.size(); ++i) {
-    if (inputs[i].type == type)
-      (*outputs)[type] = value;
-  }
-}
-
 // Copies the initial values from |inputs| into |outputs|.
 void CopyInitialValues(const DetailInputs& inputs, FieldValueMap* outputs) {
   for (size_t i = 0; i < inputs.size(); ++i) {
     const DetailInput& input = inputs[i];
     (*outputs)[input.type] = input.initial_value;
   }
 }
 
 scoped_ptr<wallet::WalletItems> CompleteAndValidWalletItems() {
   scoped_ptr<wallet::WalletItems> items =
@@ skipping 52 matching lines @@
 
   virtual void UpdateOverlay() OVERRIDE {
     EXPECT_GE(updates_started_, 1);
   }
 
   virtual void UpdateDetailArea() OVERRIDE {
     EXPECT_GE(updates_started_, 1);
   }
 
   virtual void UpdateSection(DialogSection section) OVERRIDE {
+    section_updates_[section]++;
     EXPECT_GE(updates_started_, 1);
   }
 
   virtual void UpdateErrorBubble() OVERRIDE {
     EXPECT_GE(updates_started_, 1);
   }
 
   virtual void FillSection(DialogSection section,
                            const DetailInput& originating_input) OVERRIDE {};
   virtual void GetUserInput(DialogSection section, FieldValueMap* output)
@@ skipping 25 matching lines @@
   virtual void OnSignInResize(const gfx::Size& pref_size) OVERRIDE {}
 
   void SetUserInput(DialogSection section, const FieldValueMap& map) {
     outputs_[section] = map;
   }
 
   void CheckSaveDetailsLocallyCheckbox(bool checked) {
     save_details_locally_checked_ = checked;
   }
 
+  void ClearSectionUpdates() {
+    section_updates_.clear();
+  }
+
+  std::map<DialogSection, size_t> section_updates() const {
+    return section_updates_;
+  }
+
  private:
   std::map<DialogSection, FieldValueMap> outputs_;
+  std::map<DialogSection, size_t> section_updates_;
 
   int updates_started_;
   bool save_details_locally_checked_;
 
   DISALLOW_COPY_AND_ASSIGN(TestAutofillDialogView);
 };
 
 class TestAutofillDialogController
     : public AutofillDialogControllerImpl,
       public base::SupportsWeakPtr<TestAutofillDialogController> {
@@ skipping 64 matching lines @@
       ClearLastWalletItemsFetchTimestampForTesting;
 
   // Returns the number of times that the submit button was delayed.
   int get_submit_button_delay_count() const {
     return submit_button_delay_count_;
   }
 
   MOCK_METHOD0(LoadRiskFingerprintData, void());
   using AutofillDialogControllerImpl::OnDidLoadRiskFingerprintData;
   using AutofillDialogControllerImpl::IsEditingExistingData;
+  using AutofillDialogControllerImpl::IsManuallyEditingSection;
   using AutofillDialogControllerImpl::IsSubmitPausedOn;
   using AutofillDialogControllerImpl::NOT_CHECKED;
   using AutofillDialogControllerImpl::SignedInState;
 
  protected:
   virtual PersonalDataManager* GetManager() OVERRIDE {
     return &test_manager_;
   }
 
   virtual wallet::WalletClient* GetWalletClient() OVERRIDE {
@@ skipping 201 matching lines @@
   }
 
   void UseBillingForShipping() {
     controller()->MenuModelForSection(SECTION_SHIPPING)->ActivatedAt(0);
   }
 
   void ValidateCCNumber(DialogSection section,
                         const std::string& cc_number,
                         bool should_pass) {
     FieldValueMap outputs;
-    const DetailInputs& inputs =
-        controller()->RequestedFieldsForSection(section);
-
-    SetOutputValue(inputs, CREDIT_CARD_NUMBER,
-                   ASCIIToUTF16(cc_number), &outputs);
+    outputs[CREDIT_CARD_NUMBER] = UTF8ToUTF16(cc_number);
     ValidityMessages messages =
         controller()->InputsAreValid(section, outputs);
     EXPECT_EQ(should_pass, !messages.HasSureError(CREDIT_CARD_NUMBER));
   }
 
   void SubmitWithWalletItems(scoped_ptr<wallet::WalletItems> wallet_items) {
     controller()->OnDidGetWalletItems(wallet_items.Pass());
     AcceptAndLoadFakeFingerprint();
   }
 
@@ skipping 24 matching lines @@
         return true;
     }
     return false;
   }
 
   SuggestionsMenuModel* GetMenuModelForSection(DialogSection section) {
     ui::MenuModel* model = controller()->MenuModelForSection(section);
     return static_cast<SuggestionsMenuModel*>(model);
   }
 
+  void SubmitAndVerifyShippingAndBillingResults() {
+    // Test after setting use billing for shipping.
+    UseBillingForShipping();
+
+    controller()->OnAccept();
+
+    ASSERT_EQ(20U, form_structure()->field_count());
+    EXPECT_EQ(ADDRESS_HOME_COUNTRY,
+              form_structure()->field(11)->Type().GetStorableType());
+    EXPECT_EQ(ADDRESS_BILLING, form_structure()->field(11)->Type().group());
+    EXPECT_EQ(ADDRESS_HOME_COUNTRY,
+              form_structure()->field(18)->Type().GetStorableType());
+    EXPECT_EQ(ADDRESS_HOME, form_structure()->field(18)->Type().group());
+    string16 billing_country = form_structure()->field(11)->value;
+    EXPECT_EQ(2U, billing_country.size());
+    string16 shipping_country = form_structure()->field(18)->value;
+    EXPECT_EQ(2U, shipping_country.size());
+    EXPECT_FALSE(billing_country.empty());
+    EXPECT_FALSE(shipping_country.empty());
+    EXPECT_EQ(billing_country, shipping_country);
+
+    EXPECT_EQ(CREDIT_CARD_NAME,
+              form_structure()->field(1)->Type().GetStorableType());
+    string16 cc_name = form_structure()->field(1)->value;
+    EXPECT_EQ(NAME_FULL, form_structure()->field(6)->Type().GetStorableType());
+    EXPECT_EQ(NAME_BILLING, form_structure()->field(6)->Type().group());
+    string16 billing_name = form_structure()->field(6)->value;
+    EXPECT_EQ(NAME_FULL, form_structure()->field(13)->Type().GetStorableType());
+    EXPECT_EQ(NAME, form_structure()->field(13)->Type().group());
+    string16 shipping_name = form_structure()->field(13)->value;
+
+    EXPECT_FALSE(cc_name.empty());
+    EXPECT_FALSE(billing_name.empty());
+    EXPECT_FALSE(shipping_name.empty());
+    EXPECT_EQ(cc_name, billing_name);
+    EXPECT_EQ(cc_name, shipping_name);
+  }
+
   TestAutofillDialogController* controller() { return controller_.get(); }
 
   const FormStructure* form_structure() { return form_structure_; }
 
   TestGeneratedCreditCardBubbleController* test_generated_bubble_controller() {
     return test_generated_bubble_controller_;
   }
 
   const MockNewCreditCardBubbleController* mock_new_card_bubble_controller() {
     return mock_new_card_bubble_controller_.get();
@@ skipping 68 matching lines @@
     FieldValueMap outputs;
     const DetailInputs& inputs =
         controller()->RequestedFieldsForSection(section);
     AutofillProfile full_profile(test::GetVerifiedProfile());
     for (size_t i = 0; i < inputs.size(); ++i) {
       const ServerFieldType type = inputs[i].type;
       outputs[type] = full_profile.GetInfo(AutofillType(type), "en-US");
     }
 
     // Make sure country is United States.
-    SetOutputValue(inputs, address, ASCIIToUTF16("United States"), &outputs);
+    outputs[address] = ASCIIToUTF16("United States");
 
     // Existing data should have no errors.
     ValidityMessages messages = controller()->InputsAreValid(section, outputs);
     EXPECT_FALSE(HasAnyError(messages, phone));
 
     // Input an empty phone number.
-    SetOutputValue(inputs, phone, base::string16(), &outputs);
+    outputs[phone] = base::string16();
     messages = controller()->InputsAreValid(section, outputs);
     EXPECT_TRUE(HasUnsureError(messages, phone));
 
     // Input an invalid phone number.
-    SetOutputValue(inputs, phone, ASCIIToUTF16("ABC"), &outputs);
+    outputs[phone] = ASCIIToUTF16("ABC");
     messages = controller()->InputsAreValid(section, outputs);
     EXPECT_TRUE(messages.HasSureError(phone));
 
     // Input a local phone number.
-    SetOutputValue(inputs, phone, ASCIIToUTF16("2155546699"), &outputs);
+    outputs[phone] = ASCIIToUTF16("2155546699");
     messages = controller()->InputsAreValid(section, outputs);
     EXPECT_FALSE(HasAnyError(messages, phone));
 
     // Input an invalid local phone number.
-    SetOutputValue(inputs, phone, ASCIIToUTF16("215554669"), &outputs);
+    outputs[phone] = ASCIIToUTF16("215554669");
     messages = controller()->InputsAreValid(section, outputs);
     EXPECT_TRUE(messages.HasSureError(phone));
 
     // Input an international phone number.
-    SetOutputValue(inputs, phone, ASCIIToUTF16("+33 892 70 12 39"), &outputs);
+    outputs[phone] = ASCIIToUTF16("+33 892 70 12 39");
     messages = controller()->InputsAreValid(section, outputs);
     EXPECT_FALSE(HasAnyError(messages, phone));
 
     // Input an invalid international phone number.
-    SetOutputValue(inputs, phone,
-                   ASCIIToUTF16("+112333 892 70 12 39"), &outputs);
+    outputs[phone] = ASCIIToUTF16("+112333 892 70 12 39");
     messages = controller()->InputsAreValid(section, outputs);
     EXPECT_TRUE(messages.HasSureError(phone));
   }
 }
 
 TEST_F(AutofillDialogControllerTest, ExpirationDateValidity) {
-  FieldValueMap outputs;
-  const DetailInputs& inputs =
-      controller()->RequestedFieldsForSection(SECTION_CC_BILLING);
-
   ui::ComboboxModel* exp_year_model =
       controller()->ComboboxModelForAutofillType(CREDIT_CARD_EXP_4_DIGIT_YEAR);
   ui::ComboboxModel* exp_month_model =
       controller()->ComboboxModelForAutofillType(CREDIT_CARD_EXP_MONTH);
 
   base::string16 default_year_value =
       exp_year_model->GetItemAt(exp_year_model->GetDefaultIndex());
   base::string16 default_month_value =
       exp_month_model->GetItemAt(exp_month_model->GetDefaultIndex());
 
   base::string16 other_year_value =
       exp_year_model->GetItemAt(exp_year_model->GetItemCount() - 1);
   base::string16 other_month_value =
       exp_month_model->GetItemAt(exp_month_model->GetItemCount() - 1);
 
-  SetOutputValue(inputs, CREDIT_CARD_EXP_MONTH, default_month_value, &outputs);
-  SetOutputValue(inputs, CREDIT_CARD_EXP_4_DIGIT_YEAR,
-                 default_year_value, &outputs);
+  FieldValueMap outputs;
+  outputs[CREDIT_CARD_EXP_MONTH] = default_month_value;
+  outputs[CREDIT_CARD_EXP_4_DIGIT_YEAR] = default_year_value;
 
   // Expiration default values generate unsure validation errors (but not sure).
   ValidityMessages messages = controller()->InputsAreValid(SECTION_CC_BILLING,
                                                            outputs);
   EXPECT_TRUE(HasUnsureError(messages, CREDIT_CARD_EXP_4_DIGIT_YEAR));
   EXPECT_TRUE(HasUnsureError(messages, CREDIT_CARD_EXP_MONTH));
 
   // Expiration date with default month fails.
-  SetOutputValue(inputs,
-                 CREDIT_CARD_EXP_4_DIGIT_YEAR,
-                 other_year_value,
-                 &outputs);
+  outputs[CREDIT_CARD_EXP_4_DIGIT_YEAR] = other_year_value;
   messages = controller()->InputsAreValid(SECTION_CC_BILLING, outputs);
   EXPECT_FALSE(HasUnsureError(messages, CREDIT_CARD_EXP_4_DIGIT_YEAR));
   EXPECT_TRUE(HasUnsureError(messages, CREDIT_CARD_EXP_MONTH));
 
   // Expiration date with default year fails.
-  SetOutputValue(inputs, CREDIT_CARD_EXP_MONTH, other_month_value, &outputs);
-  SetOutputValue(inputs, CREDIT_CARD_EXP_4_DIGIT_YEAR,
-                 default_year_value, &outputs);
+  outputs[CREDIT_CARD_EXP_MONTH] = other_month_value;
+  outputs[CREDIT_CARD_EXP_4_DIGIT_YEAR] = default_year_value;
   messages = controller()->InputsAreValid(SECTION_CC_BILLING, outputs);
   EXPECT_TRUE(HasUnsureError(messages, CREDIT_CARD_EXP_4_DIGIT_YEAR));
   EXPECT_FALSE(HasUnsureError(messages, CREDIT_CARD_EXP_MONTH));
 }
 
 TEST_F(AutofillDialogControllerTest, BillingNameValidation) {
   // Construct FieldValueMap from AutofillProfile data.
   SwitchToAutofill();
 
+  // Input an empty billing name.
   FieldValueMap outputs;
-  const DetailInputs& inputs =
-      controller()->RequestedFieldsForSection(SECTION_BILLING);
-
-  // Input an empty billing name.
-  SetOutputValue(inputs, NAME_BILLING_FULL, base::string16(), &outputs);
+  outputs[NAME_BILLING_FULL] = base::string16();
   ValidityMessages messages = controller()->InputsAreValid(SECTION_BILLING,
                                                            outputs);
   EXPECT_TRUE(HasUnsureError(messages, NAME_BILLING_FULL));
 
   // Input a non-empty billing name.
-  SetOutputValue(inputs, NAME_BILLING_FULL, ASCIIToUTF16("Bob"), &outputs);
+  outputs[NAME_BILLING_FULL] = ASCIIToUTF16("Bob");
   messages = controller()->InputsAreValid(SECTION_BILLING, outputs);
   EXPECT_FALSE(HasAnyError(messages, NAME_BILLING_FULL));
 
   // Switch to Wallet which only considers names with with at least two names to
   // be valid.
   SwitchToWallet();
 
   // Setup some wallet state.
   scoped_ptr<wallet::WalletItems> wallet_items =
       wallet::GetTestWalletItems(wallet::AMEX_DISALLOWED);
   controller()->OnDidGetWalletItems(wallet_items.Pass());
 
+  // Input an empty billing name. Data source should not change this behavior.
   FieldValueMap wallet_outputs;
-  const DetailInputs& wallet_inputs =
-      controller()->RequestedFieldsForSection(SECTION_CC_BILLING);
-
-  // Input an empty billing name. Data source should not change this behavior.
-  SetOutputValue(wallet_inputs, NAME_BILLING_FULL,
-                 base::string16(), &wallet_outputs);
+  wallet_outputs[NAME_BILLING_FULL] = base::string16();
   messages = controller()->InputsAreValid(SECTION_CC_BILLING, wallet_outputs);
   EXPECT_TRUE(HasUnsureError(messages, NAME_BILLING_FULL));
 
   // Input a one name billing name. Wallet does not currently support this.
-  SetOutputValue(wallet_inputs, NAME_BILLING_FULL,
-                 ASCIIToUTF16("Bob"), &wallet_outputs);
+  wallet_outputs[NAME_BILLING_FULL] = ASCIIToUTF16("Bob");
   messages = controller()->InputsAreValid(SECTION_CC_BILLING, wallet_outputs);
   EXPECT_TRUE(messages.HasSureError(NAME_BILLING_FULL));
 
   // Input a two name billing name.
-  SetOutputValue(wallet_inputs, NAME_BILLING_FULL,
-                 ASCIIToUTF16("Bob Barker"), &wallet_outputs);
+  wallet_outputs[NAME_BILLING_FULL] = ASCIIToUTF16("Bob Barker");
   messages = controller()->InputsAreValid(SECTION_CC_BILLING, wallet_outputs);
   EXPECT_FALSE(HasAnyError(messages, NAME_BILLING_FULL));
 
   // Input a more than two name billing name.
-  SetOutputValue(wallet_inputs, NAME_BILLING_FULL,
-                 ASCIIToUTF16("John Jacob Jingleheimer Schmidt"),
-                 &wallet_outputs);
+  wallet_outputs[NAME_BILLING_FULL] =
+      ASCIIToUTF16("John Jacob Jingleheimer Schmidt"),
   messages = controller()->InputsAreValid(SECTION_CC_BILLING, wallet_outputs);
   EXPECT_FALSE(HasAnyError(messages, NAME_BILLING_FULL));
 
   // Input a billing name with lots of crazy whitespace.
-  SetOutputValue(
-      wallet_inputs, NAME_BILLING_FULL,
+  wallet_outputs[NAME_BILLING_FULL] =
       ASCIIToUTF16("     \\n\\r John \\n  Jacob Jingleheimer \\t Schmidt  "),
-      &wallet_outputs);
   messages = controller()->InputsAreValid(SECTION_CC_BILLING, wallet_outputs);
   EXPECT_FALSE(HasAnyError(messages, NAME_BILLING_FULL));
 }
 
 TEST_F(AutofillDialogControllerTest, CreditCardNumberValidation) {
   // Construct FieldValueMap from AutofillProfile data.
   SwitchToAutofill();
 
   // Should accept AMEX, Visa, Master and Discover.
   ValidateCCNumber(SECTION_CC, kTestCCNumberVisa, true);
@@ skipping 306 matching lines @@
   EXPECT_FALSE(billing_name.empty());
   EXPECT_FALSE(shipping_name.empty());
   // Billing name should always be the same as cardholder name.
   EXPECT_EQ(cc_name, billing_name);
   EXPECT_NE(cc_name, shipping_name);
 }
 
 // Test selecting UseBillingForShipping.
 TEST_F(AutofillDialogControllerTest, UseBillingAsShipping) {
   SwitchToAutofill();
+
   AutofillProfile full_profile(test::GetVerifiedProfile());
+  controller()->GetTestingManager()->AddTestingProfile(&full_profile);
+
   AutofillProfile full_profile2(test::GetVerifiedProfile2());
+  controller()->GetTestingManager()->AddTestingProfile(&full_profile2);
+
   CreditCard credit_card(test::GetVerifiedCreditCard());
-  controller()->GetTestingManager()->AddTestingProfile(&full_profile);
-  controller()->GetTestingManager()->AddTestingProfile(&full_profile2);
   controller()->GetTestingManager()->AddTestingCreditCard(&credit_card);
 
-  // Test after setting use billing for shipping.
-  UseBillingForShipping();
+  ASSERT_FALSE(controller()->IsManuallyEditingSection(SECTION_CC));
+  ASSERT_FALSE(controller()->IsManuallyEditingSection(SECTION_BILLING));
 
-  controller()->OnAccept();
-  ASSERT_EQ(20U, form_structure()->field_count());
-  EXPECT_EQ(ADDRESS_HOME_STATE,
-            form_structure()->field(9)->Type().GetStorableType());
-  EXPECT_EQ(ADDRESS_BILLING, form_structure()->field(9)->Type().group());
-  EXPECT_EQ(ADDRESS_HOME_STATE,
-            form_structure()->field(16)->Type().GetStorableType());
-  EXPECT_EQ(ADDRESS_HOME, form_structure()->field(16)->Type().group());
-  string16 billing_state = form_structure()->field(9)->value;
-  string16 shipping_state = form_structure()->field(16)->value;
-  EXPECT_FALSE(billing_state.empty());
-  EXPECT_FALSE(shipping_state.empty());
-  EXPECT_EQ(billing_state, shipping_state);
+  SubmitAndVerifyShippingAndBillingResults();
+}
 
-  EXPECT_EQ(CREDIT_CARD_NAME,
-            form_structure()->field(1)->Type().GetStorableType());
-  string16 cc_name = form_structure()->field(1)->value;
-  EXPECT_EQ(NAME_FULL, form_structure()->field(6)->Type().GetStorableType());
-  EXPECT_EQ(NAME_BILLING, form_structure()->field(6)->Type().group());
-  string16 billing_name = form_structure()->field(6)->value;
-  EXPECT_EQ(NAME_FULL, form_structure()->field(13)->Type().GetStorableType());
-  EXPECT_EQ(NAME, form_structure()->field(13)->Type().group());
-  string16 shipping_name = form_structure()->field(13)->value;
+TEST_F(AutofillDialogControllerTest, UseBillingAsShippingManualInput) {
+  SwitchToAutofill();
 
-  EXPECT_FALSE(cc_name.empty());
-  EXPECT_FALSE(billing_name.empty());
-  EXPECT_FALSE(shipping_name.empty());
-  EXPECT_EQ(cc_name, billing_name);
-  EXPECT_EQ(cc_name, shipping_name);
+  ASSERT_TRUE(controller()->IsManuallyEditingSection(SECTION_CC));
+  ASSERT_TRUE(controller()->IsManuallyEditingSection(SECTION_BILLING));
+
+  CreditCard credit_card(test::GetVerifiedCreditCard());
+  FillInputs(SECTION_CC, credit_card);
+
+  AutofillProfile full_profile(test::GetVerifiedProfile());
+  FillInputs(SECTION_BILLING, full_profile);
+
+  SubmitAndVerifyShippingAndBillingResults();
 }
 
 // Tests that shipping and billing telephone fields are supported, and filled
 // in by their respective profiles. http://crbug.com/244515
 TEST_F(AutofillDialogControllerTest, BillingVsShippingPhoneNumber) {
   FormFieldData shipping_tel;
   shipping_tel.autocomplete_attribute = "shipping tel";
   FormFieldData billing_tel;
   billing_tel.autocomplete_attribute = "billing tel";
 
@@ skipping 998 matching lines @@
 
 // Ensure Wallet instruments marked expired by the server are shown as invalid.
 TEST_F(AutofillDialogControllerTest, WalletExpiredCard) {
   scoped_ptr<wallet::WalletItems> wallet_items =
       wallet::GetTestWalletItems(wallet::AMEX_DISALLOWED);
   wallet_items->AddInstrument(wallet::GetTestMaskedInstrumentExpired());
   controller()->OnDidGetWalletItems(wallet_items.Pass());
 
   EXPECT_TRUE(controller()->IsEditingExistingData(SECTION_CC_BILLING));
 
-  // Use |SetOutputValue()| to put the right ServerFieldTypes into the map.
   const DetailInputs& inputs =
       controller()->RequestedFieldsForSection(SECTION_CC_BILLING);
   FieldValueMap outputs;
   CopyInitialValues(inputs, &outputs);
-  SetOutputValue(inputs, COMPANY_NAME, ASCIIToUTF16("Bluth Company"), &outputs);
+  outputs[COMPANY_NAME] = ASCIIToUTF16("Bluth Company");
 
   // The local inputs are invalid because the server said so. They'll
   // stay invalid until they differ from the remotely fetched model.
   ValidityMessages messages = controller()->InputsAreValid(SECTION_CC_BILLING,
                                                            outputs);
   EXPECT_TRUE(messages.HasSureError(CREDIT_CARD_EXP_MONTH));
   EXPECT_TRUE(messages.HasSureError(CREDIT_CARD_EXP_4_DIGIT_YEAR));
 
   // Make the local input year differ from the instrument.
   CopyInitialValues(inputs, &outputs);
-  SetOutputValue(inputs, CREDIT_CARD_EXP_4_DIGIT_YEAR,
-                 ASCIIToUTF16("3002"), &outputs);
+  outputs[CREDIT_CARD_EXP_4_DIGIT_YEAR] = ASCIIToUTF16("3002");
   messages = controller()->InputsAreValid(SECTION_CC_BILLING, outputs);
   EXPECT_FALSE(HasAnyError(messages, CREDIT_CARD_EXP_MONTH));
   EXPECT_FALSE(HasAnyError(messages, CREDIT_CARD_EXP_4_DIGIT_YEAR));
 
   // Make the local input month differ from the instrument.
   CopyInitialValues(inputs, &outputs);
-  SetOutputValue(inputs, CREDIT_CARD_EXP_MONTH, ASCIIToUTF16("06"), &outputs);
+  outputs[CREDIT_CARD_EXP_MONTH] = ASCIIToUTF16("06");
   messages = controller()->InputsAreValid(SECTION_CC_BILLING, outputs);
   EXPECT_FALSE(HasAnyError(messages, CREDIT_CARD_EXP_MONTH));
   EXPECT_FALSE(HasAnyError(messages, CREDIT_CARD_EXP_4_DIGIT_YEAR));
 }
 
 TEST_F(AutofillDialogControllerTest, ChooseAnotherInstrumentOrAddress) {
   SubmitWithWalletItems(CompleteAndValidWalletItems());
 
   EXPECT_EQ(0U, NotificationsOfType(
       DialogNotification::REQUIRED_ACTION).size());
@@ skipping 383 matching lines @@
       if (inputs[j].type == CREDIT_CARD_NUMBER ||
           inputs[j].type == CREDIT_CARD_VERIFICATION_CODE) {
         EXPECT_FALSE(controller()->InputIsEditable(inputs[j], sections[i]));
       } else {
         EXPECT_TRUE(controller()->InputIsEditable(inputs[j], sections[i]));
       }
     }
   }
 
   // User changes the billing address; same story.
-  SetOutputValue(inputs, ADDRESS_BILLING_ZIP, ASCIIToUTF16("77025"), &outputs);
+  outputs[ADDRESS_BILLING_ZIP] = ASCIIToUTF16("77025");
   controller()->GetView()->SetUserInput(SECTION_CC_BILLING, outputs);
   for (size_t i = 0; i < arraysize(sections); ++i) {
     const DetailInputs& inputs =
         controller()->RequestedFieldsForSection(sections[i]);
     for (size_t j = 0; j < inputs.size(); ++j) {
       if (inputs[j].type == CREDIT_CARD_NUMBER ||
           inputs[j].type == CREDIT_CARD_VERIFICATION_CODE) {
         EXPECT_FALSE(controller()->InputIsEditable(inputs[j], sections[i]));
       } else {
         EXPECT_TRUE(controller()->InputIsEditable(inputs[j], sections[i]));
       }
     }
   }
 
   // User changes a detail of the CC itself (expiration date), CVV is now
   // editable (and mandatory).
-  SetOutputValue(inputs, CREDIT_CARD_EXP_MONTH, ASCIIToUTF16("06"), &outputs);
+  outputs[CREDIT_CARD_EXP_MONTH] = ASCIIToUTF16("06");
   controller()->GetView()->SetUserInput(SECTION_CC_BILLING, outputs);
   for (size_t i = 0; i < arraysize(sections); ++i) {
     const DetailInputs& inputs =
         controller()->RequestedFieldsForSection(sections[i]);
     for (size_t j = 0; j < inputs.size(); ++j) {
       if (inputs[j].type == CREDIT_CARD_NUMBER)
         EXPECT_FALSE(controller()->InputIsEditable(inputs[j], sections[i]));
       else
         EXPECT_TRUE(controller()->InputIsEditable(inputs[j], sections[i]));
     }
@@ skipping 44 matching lines @@
 TEST_F(AutofillDialogControllerTest, PassiveAuthFailure) {
   controller()->OnDidGetWalletItems(
       wallet::GetTestWalletItemsWithRequiredAction(
            wallet::PASSIVE_GAIA_AUTH));
   EXPECT_TRUE(controller()->ShouldShowSpinner());
   controller()->OnPassiveSigninFailure(GoogleServiceAuthError(
       GoogleServiceAuthError::NONE));
   EXPECT_FALSE(controller()->ShouldShowSpinner());
 }
 
+TEST_F(AutofillDialogControllerTest, CountryChangeUpdatesSection) {
+  CommandLine::ForCurrentProcess()->AppendSwitch(
+      ::switches::kEnableAutofillAddressInternationalization);
+  Reset();
+
+  controller()->GetView()->ClearSectionUpdates();
+
+  controller()->ComboboxItemSelected(
+      controller()->ComboboxModelForAutofillType(ADDRESS_HOME_COUNTRY),
+      SECTION_SHIPPING,
+      3);
+  EXPECT_EQ(1U, controller()->GetView()->section_updates()[SECTION_SHIPPING]);
+  EXPECT_EQ(0U, controller()->GetView()->section_updates()[SECTION_BILLING]);
+
+  controller()->ComboboxItemSelected(
+      controller()->ComboboxModelForAutofillType(ADDRESS_BILLING_COUNTRY),
+      SECTION_BILLING,
+      3);
+  EXPECT_EQ(1U, controller()->GetView()->section_updates()[SECTION_BILLING]);
+  EXPECT_EQ(1U, controller()->GetView()->section_updates()[SECTION_SHIPPING]);
+}
+
 }  // namespace autofill