trunk/src/chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc - Issue 388613002: Revert 282408 "Use upstream libaddressinput in Chrome."

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

Issue 388613002: Revert 282408 "Use upstream libaddressinput in Chrome." (Closed) Base URL: svn://svn.chromium.org/chrome/

Patch Set: Created 6 years, 5 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

Download patch

« no previous file with comments | « trunk/src/chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc ('k') | trunk/src/chrome/browser/ui/autofill/autofill_dialog_i18n_input.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

===================================================================

--- trunk/src/chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc (revision 282425)

+++ trunk/src/chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc (working copy)

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

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

@@ -57,9 +55,8 @@

#include "grit/generated_resources.h"

#include "testing/gmock/include/gmock/gmock.h"

#include "testing/gtest/include/gtest/gtest.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 "third_party/libaddressinput/chromium/cpp/include/libaddressinput/address_data.h"

+#include "third_party/libaddressinput/chromium/cpp/include/libaddressinput/address_validator.h"

#include "ui/base/l10n/l10n_util.h"

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

@@ -74,7 +71,11 @@

namespace {

-using ::i18n::addressinput::FieldProblemMap;

+using ::i18n::addressinput::AddressData;

+using ::i18n::addressinput::AddressProblemFilter;

+using ::i18n::addressinput::AddressProblem;

+using ::i18n::addressinput::AddressProblems;

+using ::i18n::addressinput::AddressValidator;

using testing::AtLeast;

using testing::DoAll;

using testing::Return;

@@ -1020,9 +1021,11 @@

// Now make up a problem and make sure the profile isn't in the list.

Reset();

SwitchToAutofill();

- FieldProblemMap problems;

- problems.insert(std::make_pair(::i18n::addressinput::POSTAL_CODE,

- ::i18n::addressinput::MISMATCHING_VALUE));

+ AddressProblems problems;

+ problems.push_back(

+ AddressProblem(::i18n::addressinput::POSTAL_CODE,

+ AddressProblem::MISMATCHING_VALUE,

+ IDS_LEARN_MORE));

EXPECT_CALL(*controller()->GetMockValidator(),

ValidateAddress(CountryCodeMatcher("US"), _, _)).

WillRepeatedly(DoAll(SetArgPointee<2>(problems),

@@ -1050,9 +1053,11 @@

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

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