Add country combobox to change country and rebuild address inputs.

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"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "chrome/browser/autofill/personal_data_manager_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/autofill/account_chooser_model.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_controller_impl.h"
+#include "chrome/browser/ui/autofill/autofill_dialog_i18n_input.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_view.h"
 #include "chrome/browser/ui/autofill/data_model_wrapper.h"
 #include "chrome/browser/ui/autofill/tab_autofill_manager_delegate.h"
 #include "chrome/browser/ui/autofill/test_generated_credit_card_bubble_controller.h"
 #include "chrome/browser/ui/autofill/testable_autofill_dialog_view.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
+#include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "components/autofill/content/browser/risk/proto/fingerprint.pb.h"
 #include "components/autofill/content/browser/wallet/mock_wallet_client.h"
 #include "components/autofill/content/browser/wallet/wallet_service_url.h"
 #include "components/autofill/content/browser/wallet/wallet_test_util.h"
 #include "components/autofill/core/browser/autofill_metrics.h"
 #include "components/autofill/core/browser/autofill_test_utils.h"
@@ skipping 142 matching lines @@
 
   void set_notifications(const std::vector<DialogNotification>& notifications) {
     notifications_ = notifications;
   }
 
   TestPersonalDataManager* GetTestingManager() {
     return &test_manager_;
   }
 
   using AutofillDialogControllerImpl::IsEditingExistingData;
+  using AutofillDialogControllerImpl::IsManuallyEditingSection;
   using AutofillDialogControllerImpl::IsPayingWithWallet;
   using AutofillDialogControllerImpl::IsSubmitPausedOn;
   using AutofillDialogControllerImpl::OnDidLoadRiskFingerprintData;
   using AutofillDialogControllerImpl::AccountChooserModelForTesting;
   using AutofillDialogControllerImpl::
       ClearLastWalletItemsFetchTimestampForTesting;
 
   void set_use_validation(bool use_validation) {
     use_validation_ = use_validation;
   }
@@ skipping 351 matching lines @@
   RunMessageLoop();
 
   EXPECT_EQ(AutofillMetrics::DIALOG_CANCELED,
             metric_logger().dialog_dismissal_action());
 }
 
 IN_PROC_BROWSER_TEST_F(AutofillDialogControllerTest, FillInputFromAutofill) {
   AutofillProfile full_profile(test::GetFullProfile());
   controller()->GetTestingManager()->AddTestingProfile(&full_profile);
 
+  ui::MenuModel* model = controller()->MenuModelForSection(SECTION_SHIPPING);
+  model->ActivatedAt(model->GetItemCount() - 2);
+  ASSERT_TRUE(controller()->IsManuallyEditingSection(SECTION_SHIPPING));

[Evan Stade, 2014/01/14 17:19:38]

nit: add comment about what the second to last item is

[Dan Beam, 2014/01/15 03:10:48]

Done.

+
   const DetailInputs& inputs =
       controller()->RequestedFieldsForSection(SECTION_SHIPPING);
   const ServerFieldType triggering_type = inputs[0].type;
   base::string16 value = full_profile.GetRawInfo(triggering_type);
   TestableAutofillDialogView* view = controller()->GetTestableView();
   view->SetTextContentsOfInput(triggering_type,
                                value.substr(0, value.size() / 2));
   view->ActivateInput(triggering_type);
 
   ASSERT_EQ(triggering_type, controller()->popup_input_type());
@@ skipping 33 matching lines @@
 
 // For now, no matter what, the country must always be US. See
 // http://crbug.com/247518
 IN_PROC_BROWSER_TEST_F(AutofillDialogControllerTest,
                        FillInputFromForeignProfile) {
   AutofillProfile full_profile(test::GetFullProfile());
   full_profile.SetInfo(AutofillType(ADDRESS_HOME_COUNTRY),
                        ASCIIToUTF16("France"), "en-US");
   controller()->GetTestingManager()->AddTestingProfile(&full_profile);
 
+  ui::MenuModel* model = controller()->MenuModelForSection(SECTION_SHIPPING);
+  model->ActivatedAt(model->GetItemCount() - 2);
+  ASSERT_TRUE(controller()->IsManuallyEditingSection(SECTION_SHIPPING));
+
   const DetailInputs& inputs =
       controller()->RequestedFieldsForSection(SECTION_SHIPPING);
   const ServerFieldType triggering_type = inputs[0].type;
   base::string16 value = full_profile.GetRawInfo(triggering_type);
   TestableAutofillDialogView* view = controller()->GetTestableView();
   view->SetTextContentsOfInput(triggering_type,
                                value.substr(0, value.size() / 2));
   view->ActivateInput(triggering_type);
 
   ASSERT_EQ(triggering_type, controller()->popup_input_type());
@@ skipping 468 matching lines @@
 
   controller()->OnDidGetWalletItems(
       wallet::GetTestWalletItems(wallet::AMEX_DISALLOWED));
 
   // Wallet should now be selected and Chrome shouldn't have crashed (which can
   // happen if the WebContents is deleted while proccessing a nav entry commit).
   EXPECT_TRUE(account_chooser_model->WalletIsSelected());
 }
 
 IN_PROC_BROWSER_TEST_F(AutofillDialogControllerTest, AddAccount) {
-  InitializeController();
-
   controller()->OnDidFetchWalletCookieValue(std::string());
   std::vector<std::string> usernames;
   usernames.push_back("user_0@example.com");
   controller()->OnDidGetWalletItems(
       wallet::GetTestWalletItemsWithUsers(usernames, 0));
 
   // Switch to Autofill.
   AccountChooserModel* account_chooser_model =
       controller()->AccountChooserModelForTesting();
   account_chooser_model->ActivatedAt(
@@ skipping 219 matching lines @@
 IN_PROC_BROWSER_TEST_F(AutofillDialogControllerTest,
                        MAYBE_DoesWorkOnHttpWithFlag) {
   net::SpawnedTestServer http_server(
       net::SpawnedTestServer::TYPE_HTTP,
       net::SpawnedTestServer::kLocalhost,
       base::FilePath(FILE_PATH_LITERAL("chrome/test/data")));
   ASSERT_TRUE(http_server.Start());
   EXPECT_TRUE(RunTestPage(http_server));
 }
 
+IN_PROC_BROWSER_TEST_F(AutofillDialogControllerTest,
+                       CountryChangeRebuildsSection) {
+  CommandLine* command_line = CommandLine::ForCurrentProcess();
+  command_line->AppendSwitch(::switches::kEnableAutofillAddressI18n);
+  ASSERT_TRUE(i18ninput::Enabled());
+
+  InitializeController();
+
+  controller()->OnDidFetchWalletCookieValue(std::string());
+  controller()->OnDidGetWalletItems(
+      wallet::GetTestWalletItems(wallet::AMEX_DISALLOWED));
+  EXPECT_TRUE(controller()->IsPayingWithWallet());
+
+  // Select "Add new shipping address...".
+  controller()->MenuModelForSection(SECTION_SHIPPING)->ActivatedAt(1);
+  ASSERT_TRUE(controller()->IsManuallyEditingSection(SECTION_SHIPPING));
+
+  TestableAutofillDialogView* view = controller()->GetTestableView();
+  ASSERT_EQ(ASCIIToUTF16("United States"),
+            view->GetTextContentsOfInput(ADDRESS_HOME_COUNTRY));
+
+  const DetailInputs& us_inputs =
+      controller()->RequestedFieldsForSection(SECTION_SHIPPING);
+  EXPECT_EQ(8U, us_inputs.size());
+
+  // Check that there's no dependent locality for the US layout.
+  for (size_t i = 0; i < us_inputs.size(); ++i) {
+    EXPECT_NE(us_inputs[i].type, ADDRESS_HOME_DEPENDENT_LOCALITY);
+  }
+
+  // Add some valid user input that should be preserved when country changes and
+  // switch from United States to China.
+  view->SetTextContentsOfInput(NAME_FULL, ASCIIToUTF16("B. Loblaw"));
+  view->SetTextContentsOfInput(ADDRESS_HOME_COUNTRY, ASCIIToUTF16("China"));
+  ASSERT_TRUE(controller()->IsManuallyEditingSection(SECTION_SHIPPING));
+
+  EXPECT_EQ(ASCIIToUTF16("B. Loblaw"), view->GetTextContentsOfInput(NAME_FULL));
+  EXPECT_EQ(ASCIIToUTF16("China"),
+            view->GetTextContentsOfInput(ADDRESS_HOME_COUNTRY));
+
+  const DetailInputs& cn_inputs =
+      controller()->RequestedFieldsForSection(SECTION_SHIPPING);
+  EXPECT_EQ(9U, cn_inputs.size());
+
+  // Check that there is dependent locality for the Chinese layout.
+  size_t i = 0;
+  for (; i < cn_inputs.size(); ++i) {
+    if (cn_inputs[i].type == ADDRESS_HOME_DEPENDENT_LOCALITY)
+      break;
+  }
+  EXPECT_LT(i, cn_inputs.size());
+
+  // Changing data sources should preserve country selection.
+  ui::MenuModel* account_chooser = controller()->MenuModelForAccountChooser();
+  account_chooser->ActivatedAt(account_chooser->GetItemCount() - 1);
+  EXPECT_FALSE(controller()->IsPayingWithWallet());
+
+  EXPECT_EQ(ASCIIToUTF16("China"),
+            view->GetTextContentsOfInput(ADDRESS_HOME_COUNTRY));
+
+  // Selecting "Add new shipping address..." with a non-default country should
+  // clear the manual input in that section and reset to default country.
+  controller()->MenuModelForSection(SECTION_SHIPPING)->ActivatedAt(1);
+
+  EXPECT_EQ(base::string16(), view->GetTextContentsOfInput(NAME_FULL));

[Evan Stade, 2014/01/14 17:19:38]

you should also check that NAME_FULL still has something in it after changing
data sources (L1404)

[Dan Beam, 2014/01/15 03:10:48]

oh, I did have that... somehow it got dropped.  added back.

+  EXPECT_EQ(ASCIIToUTF16("United States"),
+            view->GetTextContentsOfInput(ADDRESS_HOME_COUNTRY));
+}
+
 // Like the parent test, but doesn't add the --reduce-security-for-testing flag.
 class AutofillDialogControllerSecurityTest :
     public AutofillDialogControllerTest {
  public:
   AutofillDialogControllerSecurityTest() {}
   virtual ~AutofillDialogControllerSecurityTest() {}
 
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
     CHECK(!command_line->HasSwitch(::switches::kReduceSecurityForTesting));
   }
@@ skipping 46 matching lines @@
                        MAYBE_DoesntWorkOnBrokenHttps) {
   net::SpawnedTestServer https_server(
       net::SpawnedTestServer::TYPE_HTTPS,
       SSLOptions(SSLOptions::CERT_EXPIRED),
       base::FilePath(FILE_PATH_LITERAL("chrome/test/data")));
   ASSERT_TRUE(https_server.Start());
   EXPECT_FALSE(RunTestPage(https_server));
 }
 
 }  // namespace autofill