| Index: chrome/browser/ui/autofill/autofill_dialog_controller_browsertest.cc
|
| diff --git a/chrome/browser/ui/autofill/autofill_dialog_controller_browsertest.cc b/chrome/browser/ui/autofill/autofill_dialog_controller_browsertest.cc
|
| index 1ebd14e42d519207cc9e2369bd7e43fa1161ec47..2f6b343d55fd6ea74e26d8abfc1913c057f0cbbb 100644
|
| --- a/chrome/browser/ui/autofill/autofill_dialog_controller_browsertest.cc
|
| +++ b/chrome/browser/ui/autofill/autofill_dialog_controller_browsertest.cc
|
| @@ -81,7 +81,6 @@ namespace {
|
|
|
| using testing::Return;
|
| using testing::_;
|
| -using ::i18n::addressinput::AddressValidator;
|
|
|
| void MockCallback(AutofillManagerDelegate::RequestAutocompleteResult,
|
| const base::string16& message,
|
| @@ -230,7 +229,7 @@ class TestAutofillDialogController : public AutofillDialogControllerImpl {
|
| return &const_cast<TestAutofillDialogController*>(this)->test_manager_;
|
| }
|
|
|
| - virtual AddressValidator* GetValidator() OVERRIDE {
|
| + virtual PreloadAddressValidator* GetValidator() OVERRIDE {
|
| return &mock_validator_;
|
| }
|
|
|
| @@ -1716,7 +1715,7 @@ IN_PROC_BROWSER_TEST_F(AutofillDialogControllerTest, RulesLoaded) {
|
|
|
| EXPECT_CALL(*controller()->GetMockValidator(),
|
| ValidateAddress(CountryCodeMatcher("DE"), _, _)).Times(2).
|
| - WillOnce(Return(AddressValidator::RULES_NOT_READY));
|
| + WillOnce(Return(PreloadAddressValidator::RULES_NOT_READY));
|
|
|
| // Validation should occur on country change and see the rules haven't loaded.
|
| scoped_ptr<AutofillDialogViewTester> view = GetViewTester();
|
|
|