chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc - Issue 298863012: Use upstream libaddressinput in Chrome.

Unified Diff: chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc

Issue 298863012: Use upstream libaddressinput in Chrome. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Work in progress for suggestions impl. Created 6 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

« chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc ('K') | « chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc ('k') | chrome/browser/ui/autofill/autofill_dialog_i18n_input.h » ('j') | chrome/browser/ui/autofill/autofill_dialog_i18n_input.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc

diff --git a/chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc b/chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc

index 9d894ee306ed90568db83f3ee0eaf2a0fa63d2ff..0186127aa26b1a91438a1181f07dbbc8c3679901 100644

--- a/chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc

+++ b/chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc

@@ -3,7 +3,9 @@

// 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"

@@ -54,8 +56,10 @@

#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/preload_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 "third_party/libaddressinput/src/cpp/include/libaddressinput/address_validator.h"

#include "ui/base/resource/resource_bundle.h"

#if defined(OS_WIN)

@@ -69,11 +73,7 @@ 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;

@@ -1009,11 +1009,9 @@ TEST_F(AutofillDialogControllerTest, AutofillProfilesPopInvalidIntoEdit) {

// 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),

@@ -1041,11 +1039,9 @@ TEST_F(AutofillDialogControllerTest, AutofillProfilesRevalidateAfterRulesLoad) {

EXPECT_FALSE(controller()->IsManuallyEditingSection(SECTION_SHIPPING));

EXPECT_FALSE(controller()->IsManuallyEditingSection(SECTION_BILLING));