rAc: When filling partial autofill data, don't fill across dialog sections.

chrome/browser/ui/autofill/autofill_dialog_controller_browsertest.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 "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 654 matching lines @@
   EXPECT_EQ(AutofillMetrics::DIALOG_CANCELED,
             metric_logger().dialog_dismissal_action());
 }
 
 IN_PROC_BROWSER_TEST_F(AutofillDialogControllerTest, FillInputFromAutofill) {
   AutofillProfile full_profile(test::GetFullProfile());
   const base::string16 formatted_phone(ASCIIToUTF16("+1 (310) 555 1234"));
   full_profile.SetRawInfo(PHONE_HOME_WHOLE_NUMBER, formatted_phone);
   controller()->GetTestingManager()->AddTestingProfile(&full_profile);
 
+  // Adding a new billing address.

[groby-ooo-7-16, 2014/06/30 22:01:31]

Who is adding that address? Not sure I get what the comment refers to.

[Evan Stade, 2014/06/30 22:16:46]

sorry, should read: "Dialog is already asking for a new billing address."

+  EXPECT_TRUE(controller()->IsManuallyEditingSection(SECTION_BILLING));
+
   // Select "Add new shipping address...".
   ui::MenuModel* model = controller()->MenuModelForSection(SECTION_SHIPPING);
   model->ActivatedAt(model->GetItemCount() - 2);
   ASSERT_TRUE(controller()->IsManuallyEditingSection(SECTION_SHIPPING));
 
+  // Enter something in a shipping input.
   const DetailInputs& inputs =
       controller()->RequestedFieldsForSection(SECTION_SHIPPING);
   const ServerFieldType triggering_type = inputs[0].type;
   base::string16 value = full_profile.GetRawInfo(triggering_type);
   scoped_ptr<AutofillDialogViewTester> view = GetViewTester();
   view->SetTextContentsOfInput(triggering_type,
                                value.substr(0, value.size() / 2));
   view->ActivateInput(triggering_type);
 
   ASSERT_EQ(triggering_type, controller()->popup_input_type());
   controller()->DidAcceptSuggestion(base::string16(), 0);
 
   // All inputs should be filled.
   AutofillProfileWrapper wrapper(&full_profile);
   for (size_t i = 0; i < inputs.size(); ++i) {
     EXPECT_EQ(wrapper.GetInfoForDisplay(AutofillType(inputs[i].type)),
               view->GetTextContentsOfInput(inputs[i].type));
 
     // Double check the correct formatting is used for the phone number.
     if (inputs[i].type == PHONE_HOME_WHOLE_NUMBER)
       EXPECT_EQ(formatted_phone, view->GetTextContentsOfInput(inputs[i].type));
   }
 
+  // Inputs from the other section (billing) should be left alone.
+  const DetailInputs& other_section_inputs =
+      controller()->RequestedFieldsForSection(SECTION_BILLING);
+  for (size_t i = 0; i < inputs.size(); ++i) {
+    base::string16 input_value =
+        view->GetTextContentsOfInput(other_section_inputs[i].type);
+    // If there's a combobox, the string should be non-empty.
+    if (controller()->ComboboxModelForAutofillType(
+            other_section_inputs[i].type)) {
+      EXPECT_NE(base::string16(), input_value);
+    } else {
+      EXPECT_EQ(base::string16(), input_value);
+    }
+  }
+
   // Now simulate some user edits and try again.
   std::vector<base::string16> expectations;
   for (size_t i = 0; i < inputs.size(); ++i) {
     if (controller()->ComboboxModelForAutofillType(inputs[i].type)) {
       expectations.push_back(base::string16());
       continue;
     }
     base::string16 users_input = i % 2 == 0 ? base::string16()
                                             : ASCIIToUTF16("dummy");
     view->SetTextContentsOfInput(inputs[i].type, users_input);
@@ skipping 951 matching lines @@
 
   // Select "Add new shipping address...".
   controller()->MenuModelForSection(SECTION_SHIPPING)->ActivatedAt(1);
 
   scoped_ptr<AutofillDialogViewTester> view = GetViewTester();
   ASSERT_EQ(ASCIIToUTF16("United States"),
             view->GetTextContentsOfInput(ADDRESS_BILLING_COUNTRY));
   ASSERT_EQ(ASCIIToUTF16("United States"),
             view->GetTextContentsOfInput(ADDRESS_HOME_COUNTRY));
 
-  base::string16 name = full_profile.GetRawInfo(NAME_FULL);
-  view->SetTextContentsOfInput(NAME_FULL, name.substr(0, name.size() / 2));
-  view->ActivateInput(NAME_FULL);
-  ASSERT_EQ(NAME_FULL, controller()->popup_input_type());
+  const ServerFieldType input_type = EMAIL_ADDRESS;
+  base::string16 name = full_profile.GetRawInfo(input_type);
+  view->SetTextContentsOfInput(input_type, name.substr(0, name.size() / 2));
+  view->ActivateInput(input_type);
+  ASSERT_EQ(input_type, controller()->popup_input_type());
   controller()->DidAcceptSuggestion(base::string16(), 0);
 
   EXPECT_EQ(ASCIIToUTF16("Germany"),
             view->GetTextContentsOfInput(ADDRESS_BILLING_COUNTRY));
-  EXPECT_EQ(ASCIIToUTF16("Germany"),
+  EXPECT_EQ(ASCIIToUTF16("United States"),
             view->GetTextContentsOfInput(ADDRESS_HOME_COUNTRY));
 }
 
 IN_PROC_BROWSER_TEST_F(AutofillDialogControllerTest,
                        FillingFormPreservesChangedCountry) {
   AutofillProfile full_profile(test::GetFullProfile());
   full_profile.SetRawInfo(ADDRESS_HOME_COUNTRY, ASCIIToUTF16("DE"));
   controller()->GetTestingManager()->AddTestingProfile(&full_profile);
 
   // Select "Add new shipping address...".
@@ skipping 55 matching lines @@
       "<input autocomplete='transaction-currency' value='USD'>"
       "<input autocomplete='cc-csc'>");
   AutofillDialogControllerImpl* controller = SetUpHtmlAndInvoke(html);
   ASSERT_TRUE(controller);
 
   EXPECT_EQ(ASCIIToUTF16("24"), controller->transaction_amount_);
   EXPECT_EQ(ASCIIToUTF16("USD"), controller->transaction_currency_);
 }
 
 }  // namespace autofill