Reland "Use upstream libaddressinput in Chrome."

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 <utility>
 
+#include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.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"
@@ skipping 31 matching lines @@
 #include "components/autofill/core/common/form_data.h"
 #include "components/user_prefs/user_prefs.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/mock_render_process_host.h"
 #include "google_apis/gaia/google_service_auth_error.h"
 #include "grit/component_scaled_resources.h"
 #include "grit/components_strings.h"
 #include "grit/generated_resources.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/libaddressinput/chromium/cpp/include/libaddressinput/address_data.h"
-#include "third_party/libaddressinput/chromium/cpp/include/libaddressinput/address_validator.h"
+#include "third_party/libaddressinput/chromium/chrome_address_validator.h"
+#include "third_party/libaddressinput/src/cpp/include/libaddressinput/address_field.h"
+#include "third_party/libaddressinput/src/cpp/include/libaddressinput/address_problem.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
 #if defined(OS_WIN)
 #include "ui/base/win/scoped_ole_initializer.h"
 #endif
 
 using base::ASCIIToUTF16;
 using base::UTF8ToUTF16;
 
 namespace autofill {
 
 namespace {
 
-using ::i18n::addressinput::AddressData;
-using ::i18n::addressinput::AddressProblemFilter;
-using ::i18n::addressinput::AddressProblem;
-using ::i18n::addressinput::AddressProblems;
-using ::i18n::addressinput::AddressValidator;
+using ::i18n::addressinput::FieldProblemMap;
 using testing::AtLeast;
 using testing::DoAll;
 using testing::Return;
 using testing::SetArgPointee;
 using testing::_;
 
 const char kSourceUrl[] = "http://localbike.shop";
 const char kFakeEmail[] = "user@chromium.org";
 const char kFakeFingerprintEncoded[] = "CgVaAwiACA==";
 const char kEditedBillingAddress[] = "123 edited billing address";
@@ skipping 925 matching lines @@
 
   AutofillProfile verified_profile(test::GetVerifiedProfile());
   controller()->GetTestingManager()->AddTestingProfile(&verified_profile);
   EXPECT_EQ(4, shipping_model->GetItemCount());
   EXPECT_FALSE(controller()->IsManuallyEditingSection(SECTION_SHIPPING));
   EXPECT_FALSE(controller()->IsManuallyEditingSection(SECTION_BILLING));
 
   // Now make up a problem and make sure the profile isn't in the list.
   Reset();
   SwitchToAutofill();
-  AddressProblems problems;
-  problems.push_back(
-      AddressProblem(::i18n::addressinput::POSTAL_CODE,
-                     AddressProblem::MISMATCHING_VALUE,
-                     IDS_LEARN_MORE));
+  FieldProblemMap problems;
+  problems.insert(std::make_pair(::i18n::addressinput::POSTAL_CODE,
+                                 ::i18n::addressinput::MISMATCHING_VALUE));
   EXPECT_CALL(*controller()->GetMockValidator(),
               ValidateAddress(CountryCodeMatcher("US"), _, _)).
       WillRepeatedly(DoAll(SetArgPointee<2>(problems),
                            Return(AddressValidator::SUCCESS)));
 
   controller()->GetTestingManager()->AddTestingProfile(&verified_profile);
   shipping_model = GetMenuModelForSection(SECTION_SHIPPING);
   EXPECT_EQ(4, shipping_model->GetItemCount());
   EXPECT_TRUE(controller()->IsManuallyEditingSection(SECTION_SHIPPING));
   EXPECT_TRUE(controller()->IsManuallyEditingSection(SECTION_BILLING));
 }
 
 // Makes sure suggestion profiles are re-validated when validation rules load.
 TEST_F(AutofillDialogControllerTest, AutofillProfilesRevalidateAfterRulesLoad) {
   SwitchToAutofill();
   SuggestionsMenuModel* shipping_model =
       GetMenuModelForSection(SECTION_SHIPPING);
   EXPECT_EQ(3, shipping_model->GetItemCount());
   // "Same as billing" is selected.
   EXPECT_FALSE(controller()->IsManuallyEditingSection(SECTION_SHIPPING));
   EXPECT_TRUE(controller()->IsManuallyEditingSection(SECTION_BILLING));
   AutofillProfile verified_profile(test::GetVerifiedProfile());
   controller()->GetTestingManager()->AddTestingProfile(&verified_profile);
   EXPECT_EQ(4, shipping_model->GetItemCount());
   EXPECT_FALSE(controller()->IsManuallyEditingSection(SECTION_SHIPPING));
   EXPECT_FALSE(controller()->IsManuallyEditingSection(SECTION_BILLING));
 
-  AddressProblems problems;
-  problems.push_back(
-      AddressProblem(::i18n::addressinput::POSTAL_CODE,
-                     AddressProblem::MISMATCHING_VALUE,
-                     IDS_LEARN_MORE));
+  FieldProblemMap problems;
+  problems.insert(std::make_pair(::i18n::addressinput::POSTAL_CODE,
+                                 ::i18n::addressinput::MISMATCHING_VALUE));
   EXPECT_CALL(*controller()->GetMockValidator(),
               ValidateAddress(CountryCodeMatcher("US"), _, _)).
       WillRepeatedly(DoAll(SetArgPointee<2>(problems),
                            Return(AddressValidator::SUCCESS)));
 
   controller()->OnAddressValidationRulesLoaded("US", true);
   EXPECT_EQ(4, shipping_model->GetItemCount());
   EXPECT_TRUE(controller()->IsManuallyEditingSection(SECTION_SHIPPING));
   EXPECT_TRUE(controller()->IsManuallyEditingSection(SECTION_BILLING));
 }
@@ skipping 2591 matching lines @@
   EXPECT_EQ(ASCIIToUTF16("United States"), form_structure()->field(2)->value);
   EXPECT_EQ(ADDRESS_HOME_COUNTRY,
             form_structure()->field(3)->Type().GetStorableType());
   EXPECT_EQ(ASCIIToUTF16("US"), form_structure()->field(3)->value);
   EXPECT_EQ(ADDRESS_HOME_COUNTRY,
             form_structure()->field(4)->Type().GetStorableType());
   EXPECT_EQ(ASCIIToUTF16("United States"), form_structure()->field(4)->value);
 }
 
 }  // namespace autofill