rAc: split TestableAutofillDialogView implementation into its own class

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/autofill_dialog_view_tester.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/gaia_account.h"
@@ skipping 300 matching lines @@
         metric_logger_,
         message_loop_runner_);
     controller_->Show();
     CycleRunLoops();  // Ensures dialog is fully visible.
   }
 
   content::WebContents* GetActiveWebContents() {
     return browser()->tab_strip_model()->GetActiveWebContents();
   }
 
+  scoped_ptr<AutofillDialogViewTester> GetViewTester() {
+    return AutofillDialogViewTester::For(controller()->view()).Pass();
+  }
+
   const MockAutofillMetrics& metric_logger() { return metric_logger_; }
   TestAutofillDialogController* controller() { return controller_; }
 
   void RunMessageLoop() {
     message_loop_runner_->Run();
   }
 
   // Loads an HTML page in |GetActiveWebContents()| with markup as follows:
   // <form>|form_inner_html|</form>. After loading, emulates a click event on
   // the page as requestAutocomplete() must be in response to a user gesture.
@@ skipping 136 matching lines @@
 
   // Weak; owned by the active web contents.
   TestGeneratedCreditCardBubbleController* test_generated_bubble_controller_;
 
   DISALLOW_COPY_AND_ASSIGN(AutofillDialogControllerTest);
 };
 
 #if defined(TOOLKIT_VIEWS) || defined(OS_MACOSX)
 // Submit the form data.
 IN_PROC_BROWSER_TEST_F(AutofillDialogControllerTest, Submit) {
-  controller()->GetTestableView()->SubmitForTesting();
+  GetViewTester()->SubmitForTesting();
 
   RunMessageLoop();
 
   EXPECT_EQ(AutofillMetrics::DIALOG_ACCEPTED,
             metric_logger().dialog_dismissal_action());
 }
 
 // Cancel out of the dialog.
 IN_PROC_BROWSER_TEST_F(AutofillDialogControllerTest, Cancel) {
-  controller()->GetTestableView()->CancelForTesting();
+  GetViewTester()->CancelForTesting();
 
   RunMessageLoop();
 
   EXPECT_EQ(AutofillMetrics::DIALOG_CANCELED,
             metric_logger().dialog_dismissal_action());
 }
 
 // Take some other action that dismisses the dialog.
 IN_PROC_BROWSER_TEST_F(AutofillDialogControllerTest, Hide) {
   controller()->Hide();
@@ skipping 20 matching lines @@
 }
 
 // Ensure that the expected metric is logged when the dialog is closed during
 // signin.
 IN_PROC_BROWSER_TEST_F(AutofillDialogControllerTest, CloseDuringSignin) {
   controller()->SignInLinkClicked();
 
   EXPECT_CALL(metric_logger(),
               LogDialogDismissalState(
                   AutofillMetrics::DIALOG_CANCELED_DURING_SIGNIN));
-  controller()->GetTestableView()->CancelForTesting();
+  GetViewTester()->CancelForTesting();
 
   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);
 
   // Select "Add new shipping address...".
   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();
+  scoped_ptr<AutofillDialogViewTester> view = GetViewTester();
   view->SetTextContentsOfInput(triggering_type,
                                value.substr(0, value.size() / 2));
   view->ActivateInput(triggering_type);
 
   ASSERT_EQ(triggering_type, controller()->popup_input_type());
   controller()->DidAcceptSuggestion(base::string16(), 0);
 
   // All inputs should be filled.
   AutofillProfileWrapper wrapper(&full_profile);
   for (size_t i = 0; i < inputs.size(); ++i) {
@@ skipping 43 matching lines @@
 
   // Select "Add new shipping address...".
   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();
+  scoped_ptr<AutofillDialogViewTester> view = GetViewTester();
   view->SetTextContentsOfInput(triggering_type,
                                value.substr(0, value.size() / 2));
   view->ActivateInput(triggering_type);
 
   ASSERT_EQ(triggering_type, controller()->popup_input_type());
   controller()->DidAcceptSuggestion(base::string16(), 0);
 
   // All inputs should be filled.
   AutofillProfileWrapper wrapper(&full_profile);
   for (size_t i = 0; i < inputs.size(); ++i) {
@@ skipping 52 matching lines @@
   std::vector<base::string16> emails;
   emails.push_back(ASCIIToUTF16("user@example.com"));
   emails.push_back(ASCIIToUTF16("admin@example.com"));
   full_profile.SetRawMultiInfo(EMAIL_ADDRESS, emails);
   controller()->GetTestingManager()->AddTestingProfile(&full_profile);
 
   const DetailInputs& inputs =
       controller()->RequestedFieldsForSection(SECTION_BILLING);
   const ServerFieldType triggering_type = inputs[0].type;
   EXPECT_EQ(NAME_BILLING_FULL, triggering_type);
-  TestableAutofillDialogView* view = controller()->GetTestableView();
+  scoped_ptr<AutofillDialogViewTester> view = GetViewTester();
   view->ActivateInput(triggering_type);
 
   ASSERT_EQ(triggering_type, controller()->popup_input_type());
 
   // Choose the variant suggestion.
   controller()->DidAcceptSuggestion(base::string16(), 1);
 
   // All inputs should be filled.
   AutofillProfileWrapper wrapper(
       &full_profile, AutofillType(NAME_BILLING_FULL), 1);
@@ skipping 25 matching lines @@
   CreditCard card2;
   test::SetCreditCardInfo(&card2, "B Bird", "3111111111111111", "11", "2017");
   controller()->GetTestingManager()->AddTestingCreditCard(&card2);
   AutofillProfile full_profile(test::GetFullProfile());
   controller()->GetTestingManager()->AddTestingProfile(&full_profile);
 
   const DetailInputs& inputs =
       controller()->RequestedFieldsForSection(SECTION_CC);
   const ServerFieldType triggering_type = inputs[0].type;
   base::string16 value = card1.GetRawInfo(triggering_type);
-  TestableAutofillDialogView* view = controller()->GetTestableView();
+  scoped_ptr<AutofillDialogViewTester> view = GetViewTester();
   view->SetTextContentsOfInput(triggering_type,
                                value.substr(0, value.size() / 2));
   view->ActivateInput(triggering_type);
 
   ASSERT_EQ(triggering_type, controller()->popup_input_type());
   controller()->DidAcceptSuggestion(base::string16(), 0);
 
   // All inputs should be filled.
   AutofillCreditCardWrapper wrapper1(&card1);
   for (size_t i = 0; i < inputs.size(); ++i) {
@@ skipping 54 matching lines @@
   }
 }
 
 IN_PROC_BROWSER_TEST_F(AutofillDialogControllerTest, ShouldShowErrorBubble) {
   EXPECT_TRUE(controller()->ShouldShowErrorBubble());
 
   CreditCard card(test::GetCreditCard());
   ASSERT_FALSE(card.IsVerified());
   controller()->GetTestingManager()->AddTestingCreditCard(&card);
 
-  TestableAutofillDialogView* view = controller()->GetTestableView();
+  scoped_ptr<AutofillDialogViewTester> view = GetViewTester();
   view->SetTextContentsOfInput(
       CREDIT_CARD_NUMBER,
       card.GetRawInfo(CREDIT_CARD_NUMBER).substr(0, 1));
 
   view->ActivateInput(CREDIT_CARD_NUMBER);
   EXPECT_FALSE(controller()->ShouldShowErrorBubble());
 
   controller()->FocusMoved();
   EXPECT_TRUE(controller()->ShouldShowErrorBubble());
 }
@@ skipping 22 matching lines @@
   ASSERT_TRUE(model->IsItemCheckedAt(0));
   EXPECT_FALSE(controller()->IsEditingExistingData(SECTION_CC));
 
   model->ActivatedAt(1);
   ASSERT_TRUE(model->IsItemCheckedAt(1));
   EXPECT_TRUE(controller()->IsEditingExistingData(SECTION_CC));
 }
 
 // Notifications with long message text should not make the dialog bigger.
 IN_PROC_BROWSER_TEST_F(AutofillDialogControllerTest, LongNotifications) {
-  const gfx::Size no_notification_size =
-      controller()->GetTestableView()->GetSize();
+  const gfx::Size no_notification_size = GetViewTester()->GetSize();
   ASSERT_GT(no_notification_size.width(), 0);
 
   std::vector<DialogNotification> notifications;
   notifications.push_back(
       DialogNotification(DialogNotification::DEVELOPER_WARNING, ASCIIToUTF16(
           "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do "
           "eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim "
           "ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut "
           "aliquip ex ea commodo consequat. Duis aute irure dolor in "
           "reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla "
           "pariatur. Excepteur sint occaecat cupidatat non proident, sunt in "
           "culpa qui officia deserunt mollit anim id est laborum.")));
   controller()->set_notifications(notifications);
   controller()->view()->UpdateNotificationArea();
 
   EXPECT_EQ(no_notification_size.width(),
-            controller()->GetTestableView()->GetSize().width());
+            GetViewTester()->GetSize().width());
 }
 
 // http://crbug.com/318526
 #if defined(OS_MACOSX)
 #define MAYBE_AutocompleteEvent DISABLED_AutocompleteEvent
 #else
 #define MAYBE_AutocompleteEvent AutocompleteEvent
 #endif
 IN_PROC_BROWSER_TEST_F(AutofillDialogControllerTest, MAYBE_AutocompleteEvent) {
   AutofillDialogControllerImpl* controller =
       SetUpHtmlAndInvoke("<input autocomplete='cc-name'>");
   ASSERT_TRUE(controller);
 
   AddCreditcardToProfile(controller->profile(), test::GetVerifiedCreditCard());
   AddAutofillProfileToProfile(controller->profile(),
                               test::GetVerifiedProfile());
 
-  TestableAutofillDialogView* view = controller->GetTestableView();
+  scoped_ptr<AutofillDialogViewTester> view =
+      AutofillDialogViewTester::For(
+          static_cast<TestAutofillDialogController*>(controller)->view());
   view->SetTextContentsOfSuggestionInput(SECTION_CC, ASCIIToUTF16("123"));
   view->SubmitForTesting();
   ExpectDomMessage("success");
 }
 
 // http://crbug.com/318526
 #if defined(OS_MACOSX)
 #define MAYBE_AutocompleteErrorEventReasonInvalid \
     DISABLED_AutocompleteErrorEventReasonInvalid
 #else
 #define MAYBE_AutocompleteErrorEventReasonInvalid \
     AutocompleteErrorEventReasonInvalid
 #endif
 IN_PROC_BROWSER_TEST_F(AutofillDialogControllerTest,
                        MAYBE_AutocompleteErrorEventReasonInvalid) {
   AutofillDialogControllerImpl* controller =
       SetUpHtmlAndInvoke("<input autocomplete='cc-name' pattern='.*zebra.*'>");
   ASSERT_TRUE(controller);
 
   const CreditCard& credit_card = test::GetVerifiedCreditCard();
   ASSERT_TRUE(
     credit_card.GetRawInfo(CREDIT_CARD_NAME).find(ASCIIToUTF16("zebra")) ==
         base::string16::npos);
   AddCreditcardToProfile(controller->profile(), credit_card);
   AddAutofillProfileToProfile(controller->profile(),
                               test::GetVerifiedProfile());
 
-  TestableAutofillDialogView* view = controller->GetTestableView();
+  scoped_ptr<AutofillDialogViewTester> view =
+      AutofillDialogViewTester::For(
+          static_cast<TestAutofillDialogController*>(controller)->view());
   view->SetTextContentsOfSuggestionInput(SECTION_CC, ASCIIToUTF16("123"));
   view->SubmitForTesting();
   ExpectDomMessage("error: invalid");
 }
 
 // http://crbug.com/318526
 #if defined(OS_MACOSX)
 #define MAYBE_AutocompleteErrorEventReasonCancel \
     DISABLED_AutocompleteErrorEventReasonCancel
 #else
 #define MAYBE_AutocompleteErrorEventReasonCancel \
     AutocompleteErrorEventReasonCancel
 #endif
 IN_PROC_BROWSER_TEST_F(AutofillDialogControllerTest,
                        MAYBE_AutocompleteErrorEventReasonCancel) {
   AutofillDialogControllerImpl* controller =
       SetUpHtmlAndInvoke("<input autocomplete='cc-name'>");
   ASSERT_TRUE(controller);
-  controller->GetTestableView()->CancelForTesting();
+  AutofillDialogViewTester::For(
+      static_cast<TestAutofillDialogController*>(controller)->view())->
+          CancelForTesting();
   ExpectDomMessage("error: cancel");
 }
 
 IN_PROC_BROWSER_TEST_F(AutofillDialogControllerTest, NoCvcSegfault) {
   controller()->set_use_validation(true);
 
   CreditCard credit_card(test::GetVerifiedCreditCard());
   controller()->GetTestingManager()->AddTestingCreditCard(&credit_card);
   EXPECT_FALSE(controller()->IsEditingExistingData(SECTION_CC));
 
-  ASSERT_NO_FATAL_FAILURE(
-      controller()->GetTestableView()->SubmitForTesting());
+  ASSERT_NO_FATAL_FAILURE(GetViewTester()->SubmitForTesting());
 }
 
 // Flaky on Win7, WinXP, and Win Aura.  http://crbug.com/270314.
 #if defined(OS_WIN)
 #define MAYBE_PreservedSections DISABLED_PreservedSections
 #else
 #define MAYBE_PreservedSections PreservedSections
 #endif
 IN_PROC_BROWSER_TEST_F(AutofillDialogControllerTest, MAYBE_PreservedSections) {
   controller()->set_use_validation(true);
 
-  TestableAutofillDialogView* view = controller()->GetTestableView();
+  scoped_ptr<AutofillDialogViewTester> view = GetViewTester();
   view->SetTextContentsOfInput(CREDIT_CARD_NUMBER,
                                ASCIIToUTF16("4111111111111111"));
 
   // Create some invalid, manually inputted shipping data.
   view->SetTextContentsOfInput(ADDRESS_HOME_ZIP, ASCIIToUTF16("shipping zip"));
 
   // Switch to Wallet by simulating a successful server response.
   controller()->OnDidFetchWalletCookieValue(std::string());
   controller()->OnDidGetWalletItems(
       wallet::GetTestWalletItems(wallet::AMEX_DISALLOWED));
@@ skipping 23 matching lines @@
 
   scoped_ptr<wallet::WalletItems> wallet_items =
       wallet::GetTestWalletItems(wallet::AMEX_DISALLOWED);
   wallet_items->AddInstrument(wallet::GetTestMaskedInstrument());
   wallet_items->AddAddress(wallet::GetTestShippingAddress());
 
   base::string16 last_four =
       wallet_items->instruments()[0]->TypeAndLastFourDigits();
   controller()->OnDidGetWalletItems(wallet_items.Pass());
 
-  TestableAutofillDialogView* test_view = controller()->GetTestableView();
+  scoped_ptr<AutofillDialogViewTester> test_view = GetViewTester();
   EXPECT_FALSE(test_view->IsShowingOverlay());
   EXPECT_CALL(*controller(), LoadRiskFingerprintData());
   controller()->OnAccept();
   EXPECT_TRUE(test_view->IsShowingOverlay());
 
   EXPECT_CALL(*controller()->GetTestingWalletClient(), GetFullWallet(_));
   scoped_ptr<risk::Fingerprint> fingerprint(new risk::Fingerprint());
   fingerprint->mutable_machine_characteristics()->mutable_screen_size()->
       set_width(1024);
   controller()->OnDidLoadRiskFingerprintData(fingerprint.Pass());
@@ skipping 43 matching lines @@
       wallet::GetTestWalletItemsWithRequiredAction(wallet::GAIA_AUTH));
 
   NavEntryCommittedObserver sign_in_page_observer(
       controller()->SignInUrl(),
       content::NotificationService::AllSources());
 
   // Simulate a user clicking "Sign In" (which loads dialog's web contents).
   controller()->SignInLinkClicked();
   EXPECT_TRUE(controller()->ShouldShowSignInWebView());
 
-  TestableAutofillDialogView* view = controller()->GetTestableView();
+  scoped_ptr<AutofillDialogViewTester> view = GetViewTester();
   content::WebContents* sign_in_contents = view->GetSignInWebContents();
   ASSERT_TRUE(sign_in_contents);
 
   sign_in_page_observer.Wait();
 
   NavEntryCommittedObserver continue_page_observer(
       wallet::GetSignInContinueUrl(),
       content::NotificationService::AllSources());
 
   EXPECT_EQ(sign_in_contents->GetURL(), controller()->SignInUrl());
@@ skipping 44 matching lines @@
 
   NavEntryCommittedObserver sign_in_page_observer(
       controller()->SignInUrl(),
       content::NotificationService::AllSources());
 
   // Simulate a user clicking "add account".
   account_chooser_model->ActivatedAt(
       account_chooser_model->GetItemCount() - 2);
   EXPECT_TRUE(controller()->ShouldShowSignInWebView());
 
-  TestableAutofillDialogView* view = controller()->GetTestableView();
+  scoped_ptr<AutofillDialogViewTester> view = GetViewTester();
   content::WebContents* sign_in_contents = view->GetSignInWebContents();
   ASSERT_TRUE(sign_in_contents);
 
   sign_in_page_observer.Wait();
 
   NavEntryCommittedObserver continue_page_observer(
       wallet::GetSignInContinueUrl(),
       content::NotificationService::AllSources());
 
   EXPECT_EQ(sign_in_contents->GetURL(), controller()->SignInUrl());
@@ skipping 40 matching lines @@
 IN_PROC_BROWSER_TEST_F(AutofillDialogControllerTest,
                        MAYBE_FillFormIncludesCVC) {
   AutofillDialogControllerImpl* controller =
       SetUpHtmlAndInvoke("<input autocomplete='cc-csc'>");
   ASSERT_TRUE(controller);
 
   AddCreditcardToProfile(controller->profile(), test::GetVerifiedCreditCard());
   AddAutofillProfileToProfile(controller->profile(),
                               test::GetVerifiedProfile());
 
-  TestableAutofillDialogView* view = controller->GetTestableView();
+  scoped_ptr<AutofillDialogViewTester> view =
+      AutofillDialogViewTester::For(
+          static_cast<TestAutofillDialogController*>(controller)->view());
   view->SetTextContentsOfSuggestionInput(SECTION_CC, ASCIIToUTF16("123"));
   view->SubmitForTesting();
   ExpectDomMessage("success");
   EXPECT_EQ("123", GetValueForHTMLFieldOfType("cc-csc"));
 }
 
 IN_PROC_BROWSER_TEST_F(AutofillDialogControllerTest, AddNewClearsComboboxes) {
   // Ensure the input under test is a combobox.
   ASSERT_TRUE(
       controller()->ComboboxModelForAutofillType(CREDIT_CARD_EXP_MONTH));
 
   // Set up an expired card.
   CreditCard card;
   test::SetCreditCardInfo(&card, "Roy Demeo", "4111111111111111", "8", "2013");
   card.set_origin("Chrome settings");
   ASSERT_TRUE(card.IsVerified());
 
   // Add the card and check that there's a menu for that section.
   controller()->GetTestingManager()->AddTestingCreditCard(&card);
   ASSERT_TRUE(controller()->MenuModelForSection(SECTION_CC));
 
   // Select the invalid, suggested card from the menu.
   controller()->MenuModelForSection(SECTION_CC)->ActivatedAt(0);
   EXPECT_TRUE(controller()->IsEditingExistingData(SECTION_CC));
 
   // Get the contents of the combobox of the credit card's expiration month.
-  TestableAutofillDialogView* view = controller()->GetTestableView();
+  scoped_ptr<AutofillDialogViewTester> view = GetViewTester();
   base::string16 cc_exp_month_text =
       view->GetTextContentsOfInput(CREDIT_CARD_EXP_MONTH);
 
   // Select "New X..." from the suggestion menu to clear the section's inputs.
   controller()->MenuModelForSection(SECTION_CC)->ActivatedAt(1);
   EXPECT_FALSE(controller()->IsEditingExistingData(SECTION_CC));
 
   // Ensure that the credit card expiration month has changed.
   EXPECT_NE(cc_exp_month_text,
             view->GetTextContentsOfInput(CREDIT_CARD_EXP_MONTH));
@@ skipping 49 matching lines @@
   controller()->OnDidFetchWalletCookieValue(std::string());
   controller()->OnDidGetWalletItems(
       wallet::GetTestWalletItemsWithRequiredAction(wallet::GAIA_AUTH));
 
   NavEntryCommittedObserver sign_in_page_observer(
       controller()->SignInUrl(),
       content::NotificationService::AllSources());
 
   controller()->SignInLinkClicked();
 
-  TestableAutofillDialogView* view = controller()->GetTestableView();
-  content::WebContents* sign_in_contents = view->GetSignInWebContents();
+  content::WebContents* sign_in_contents =
+      GetViewTester()->GetSignInWebContents();
   ASSERT_TRUE(sign_in_contents);
 
   sign_in_page_observer.Wait();
 
   content::OpenURLParams params(GURL("http://google.com"),
                                 content::Referrer(),
                                 CURRENT_TAB,
                                 content::PAGE_TRANSITION_LINK,
                                 true);
   params.user_gesture = true;
@@ skipping 135 matching lines @@
 IN_PROC_BROWSER_TEST_F(AutofillDialogControllerI18nTest,
                        CountryChangeRebuildsSection) {
   EXPECT_FALSE(
       SectionHasField(SECTION_BILLING, ADDRESS_BILLING_DEPENDENT_LOCALITY));
   EXPECT_FALSE(SectionHasField(SECTION_SHIPPING, ADDRESS_HOME_SORTING_CODE));
 
   // Select "Add new shipping address...".
   controller()->MenuModelForSection(SECTION_SHIPPING)->ActivatedAt(1);
 
   // Add some valid user input that should be preserved when country changes.
-  TestableAutofillDialogView* view = controller()->GetTestableView();
+  scoped_ptr<AutofillDialogViewTester> view = GetViewTester();
   view->SetTextContentsOfInput(NAME_FULL, ASCIIToUTF16("B. Loblaw"));
 
   // Change both sections' countries.
   view->SetTextContentsOfInput(ADDRESS_BILLING_COUNTRY, ASCIIToUTF16("China"));
   view->ActivateInput(ADDRESS_BILLING_COUNTRY);
   view->SetTextContentsOfInput(ADDRESS_HOME_COUNTRY, ASCIIToUTF16("France"));
   view->ActivateInput(ADDRESS_HOME_COUNTRY);
 
   // Verify the name is still there.
   EXPECT_EQ(ASCIIToUTF16("B. Loblaw"), view->GetTextContentsOfInput(NAME_FULL));
@@ skipping 18 matching lines @@
   items->AddInstrument(wallet::GetTestMaskedInstrument());
   items->AddAddress(wallet::GetTestShippingAddress());
   controller()->OnDidGetWalletItems(items.Pass());
 
   EXPECT_TRUE(controller()->IsPayingWithWallet());
 
   // Select "Add new billing/shipping address...".
   controller()->MenuModelForSection(SECTION_CC_BILLING)->ActivatedAt(1);
   controller()->MenuModelForSection(SECTION_SHIPPING)->ActivatedAt(2);
 
-  TestableAutofillDialogView* view = controller()->GetTestableView();
+  scoped_ptr<AutofillDialogViewTester> view = GetViewTester();
   ASSERT_EQ(ASCIIToUTF16("United States"),
             view->GetTextContentsOfInput(ADDRESS_BILLING_COUNTRY));
   ASSERT_EQ(ASCIIToUTF16("United States"),
             view->GetTextContentsOfInput(ADDRESS_HOME_COUNTRY));
 
   // Switch both billing and shipping countries.
   view->SetTextContentsOfInput(ADDRESS_BILLING_COUNTRY, ASCIIToUTF16("China"));
   view->ActivateInput(ADDRESS_BILLING_COUNTRY);
   view->SetTextContentsOfInput(ADDRESS_HOME_COUNTRY, ASCIIToUTF16("France"));
   view->ActivateInput(ADDRESS_HOME_COUNTRY);
@@ skipping 27 matching lines @@
 }
 
 IN_PROC_BROWSER_TEST_F(AutofillDialogControllerI18nTest, AddNewResetsCountry) {
   AutofillProfile verified_profile(test::GetVerifiedProfile());
   controller()->GetTestingManager()->AddTestingProfile(&verified_profile);
 
   // Select "Add new billing/shipping address...".
   controller()->MenuModelForSection(SECTION_BILLING)->ActivatedAt(1);
   controller()->MenuModelForSection(SECTION_SHIPPING)->ActivatedAt(2);
 
-  TestableAutofillDialogView* view = controller()->GetTestableView();
+  scoped_ptr<AutofillDialogViewTester> view = GetViewTester();
   ASSERT_EQ(ASCIIToUTF16("United States"),
             view->GetTextContentsOfInput(ADDRESS_BILLING_COUNTRY));
   ASSERT_EQ(ASCIIToUTF16("United States"),
             view->GetTextContentsOfInput(ADDRESS_HOME_COUNTRY));
 
   // Switch both billing and shipping countries.
   view->SetTextContentsOfInput(ADDRESS_BILLING_COUNTRY, ASCIIToUTF16("China"));
   view->ActivateInput(ADDRESS_BILLING_COUNTRY);
   view->SetTextContentsOfInput(ADDRESS_HOME_COUNTRY, ASCIIToUTF16("France"));
   view->ActivateInput(ADDRESS_HOME_COUNTRY);
@@ skipping 10 matching lines @@
 
 IN_PROC_BROWSER_TEST_F(AutofillDialogControllerI18nTest,
                        FillingFormRebuildsInputs) {
   AutofillProfile full_profile(test::GetFullProfile());
   full_profile.SetRawInfo(ADDRESS_HOME_COUNTRY, ASCIIToUTF16("CN"));
   controller()->GetTestingManager()->AddTestingProfile(&full_profile);
 
   // Select "Add new shipping address...".
   controller()->MenuModelForSection(SECTION_SHIPPING)->ActivatedAt(1);
 
-  TestableAutofillDialogView* view = controller()->GetTestableView();
+  scoped_ptr<AutofillDialogViewTester> view = GetViewTester();
   ASSERT_EQ(ASCIIToUTF16("United States"),
             view->GetTextContentsOfInput(ADDRESS_BILLING_COUNTRY));
   ASSERT_EQ(ASCIIToUTF16("United States"),
             view->GetTextContentsOfInput(ADDRESS_HOME_COUNTRY));
 
   base::string16 name = full_profile.GetRawInfo(NAME_FULL);
   view->SetTextContentsOfInput(NAME_FULL, name.substr(0, name.size() / 2));
   view->ActivateInput(NAME_FULL);
   ASSERT_EQ(NAME_FULL, controller()->popup_input_type());
   controller()->DidAcceptSuggestion(base::string16(), 0);
 
   EXPECT_EQ(ASCIIToUTF16("China"),
             view->GetTextContentsOfInput(ADDRESS_BILLING_COUNTRY));
   EXPECT_EQ(ASCIIToUTF16("China"),
             view->GetTextContentsOfInput(ADDRESS_HOME_COUNTRY));
 }
 
 IN_PROC_BROWSER_TEST_F(AutofillDialogControllerI18nTest,
                        FillingFormPreservesChangedCountry) {
   AutofillProfile full_profile(test::GetFullProfile());
   full_profile.SetRawInfo(ADDRESS_HOME_COUNTRY, ASCIIToUTF16("CN"));
   controller()->GetTestingManager()->AddTestingProfile(&full_profile);
 
   // Select "Add new shipping address...".
   controller()->MenuModelForSection(SECTION_SHIPPING)->ActivatedAt(1);
 
-  TestableAutofillDialogView* view = controller()->GetTestableView();
+  scoped_ptr<AutofillDialogViewTester> view = GetViewTester();
   view->SetTextContentsOfInput(ADDRESS_BILLING_COUNTRY, ASCIIToUTF16("France"));
   view->ActivateInput(ADDRESS_BILLING_COUNTRY);
   view->SetTextContentsOfInput(ADDRESS_HOME_COUNTRY, ASCIIToUTF16("Belarus"));
   view->ActivateInput(ADDRESS_HOME_COUNTRY);
 
   base::string16 name = full_profile.GetRawInfo(NAME_FULL);
   view->SetTextContentsOfInput(NAME_FULL, name.substr(0, name.size() / 2));
   view->ActivateInput(NAME_FULL);
   ASSERT_EQ(NAME_FULL, controller()->popup_input_type());
   controller()->DidAcceptSuggestion(base::string16(), 0);
 
   EXPECT_EQ(ASCIIToUTF16("France"),
             view->GetTextContentsOfInput(ADDRESS_BILLING_COUNTRY));
   EXPECT_EQ(ASCIIToUTF16("Belarus"),
             view->GetTextContentsOfInput(ADDRESS_HOME_COUNTRY));
 }
 
 }  // namespace autofill