Change AutofillDialogControllerImpl::input_showing_popup_ -> popup_input_type_

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"
@@ skipping 148 matching lines @@
   virtual bool ShouldOfferToSaveInChrome() const OVERRIDE {
     return false;
   }
 
   void ForceFinishSubmit() {
     DoFinishSubmit();
   }
 
   // Increase visibility for testing.
   using AutofillDialogControllerImpl::view;
-  using AutofillDialogControllerImpl::input_showing_popup;
+  using AutofillDialogControllerImpl::popup_input_type;
 
   MOCK_METHOD0(LoadRiskFingerprintData, void());
 
   virtual std::vector<DialogNotification> CurrentNotifications() OVERRIDE {
     return notifications_;
   }
 
   void set_notifications(const std::vector<DialogNotification>& notifications) {
     notifications_ = notifications;
   }
@@ skipping 376 matching lines @@
 
   const DetailInputs& inputs =
       controller()->RequestedFieldsForSection(SECTION_SHIPPING);
   const DetailInput& triggering_input = inputs[0];
   base::string16 value = full_profile.GetRawInfo(triggering_input.type);
   TestableAutofillDialogView* view = controller()->GetTestableView();
   view->SetTextContentsOfInput(triggering_input,
                                value.substr(0, value.size() / 2));
   view->ActivateInput(triggering_input);
 
-  ASSERT_EQ(&triggering_input, controller()->input_showing_popup());
+  ASSERT_EQ(triggering_input.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) {
     EXPECT_EQ(wrapper.GetInfo(AutofillType(inputs[i].type)),
               view->GetTextContentsOfInput(inputs[i]));
   }
 
   // Now simulate some user edits and try again.
   std::vector<base::string16> expectations;
   for (size_t i = 0; i < inputs.size(); ++i) {
     base::string16 users_input = i % 2 == 0 ? base::string16()
                                             : ASCIIToUTF16("dummy");
     view->SetTextContentsOfInput(inputs[i], users_input);
     // Empty inputs should be filled, others should be left alone.
     base::string16 expectation =
         &inputs[i] == &triggering_input || users_input.empty() ?
         wrapper.GetInfo(AutofillType(inputs[i].type)) :
         users_input;
     expectations.push_back(expectation);
   }
 
   view->SetTextContentsOfInput(triggering_input,
                                value.substr(0, value.size() / 2));
   view->ActivateInput(triggering_input);
-  ASSERT_EQ(&triggering_input, controller()->input_showing_popup());
+  ASSERT_EQ(triggering_input.type, controller()->popup_input_type());
   controller()->DidAcceptSuggestion(base::string16(), 0);
 
   for (size_t i = 0; i < inputs.size(); ++i) {
     EXPECT_EQ(expectations[i], view->GetTextContentsOfInput(inputs[i]));
   }
 }
 
 // For now, no matter what, the country must always be US. See
 // http://crbug.com/247518
 IN_PROC_BROWSER_TEST_F(AutofillDialogControllerTest,
                        FillInputFromForeignProfile) {
   AutofillProfile full_profile(test::GetFullProfile());
   full_profile.SetInfo(AutofillType(ADDRESS_HOME_COUNTRY),
                        ASCIIToUTF16("France"), "en-US");
   controller()->GetTestingManager()->AddTestingProfile(&full_profile);
 
   const DetailInputs& inputs =
       controller()->RequestedFieldsForSection(SECTION_SHIPPING);
   const DetailInput& triggering_input = inputs[0];
   base::string16 value = full_profile.GetRawInfo(triggering_input.type);
   TestableAutofillDialogView* view = controller()->GetTestableView();
   view->SetTextContentsOfInput(triggering_input,
                                value.substr(0, value.size() / 2));
   view->ActivateInput(triggering_input);
 
-  ASSERT_EQ(&triggering_input, controller()->input_showing_popup());
+  ASSERT_EQ(triggering_input.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) {
     base::string16 expectation =
         AutofillType(inputs[i].type).GetStorableType() == ADDRESS_HOME_COUNTRY ?
         ASCIIToUTF16("United States") :
         wrapper.GetInfo(AutofillType(inputs[i].type));
     EXPECT_EQ(expectation, view->GetTextContentsOfInput(inputs[i]));
@@ skipping 12 matching lines @@
         users_input;
     if (AutofillType(inputs[i].type).GetStorableType() == ADDRESS_HOME_COUNTRY)
       expectation = ASCIIToUTF16("United States");
 
     expectations.push_back(expectation);
   }
 
   view->SetTextContentsOfInput(triggering_input,
                                value.substr(0, value.size() / 2));
   view->ActivateInput(triggering_input);
-  ASSERT_EQ(&triggering_input, controller()->input_showing_popup());
+  ASSERT_EQ(triggering_input.type, controller()->popup_input_type());
   controller()->DidAcceptSuggestion(base::string16(), 0);
 
   for (size_t i = 0; i < inputs.size(); ++i) {
     EXPECT_EQ(expectations[i], view->GetTextContentsOfInput(inputs[i]));
   }
 }
 
 // This test makes sure that picking a profile variant in the Autofill
 // popup works as expected.
 IN_PROC_BROWSER_TEST_F(AutofillDialogControllerTest,
@@ skipping 11 matching lines @@
   full_profile.SetRawMultiInfo(EMAIL_ADDRESS, emails);
   controller()->GetTestingManager()->AddTestingProfile(&full_profile);
 
   const DetailInputs& inputs =
       controller()->RequestedFieldsForSection(SECTION_BILLING);
   const DetailInput& triggering_input = inputs[0];
   EXPECT_EQ(NAME_BILLING_FULL, triggering_input.type);
   TestableAutofillDialogView* view = controller()->GetTestableView();
   view->ActivateInput(triggering_input);
 
-  ASSERT_EQ(&triggering_input, controller()->input_showing_popup());
+  ASSERT_EQ(triggering_input.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);
   for (size_t i = 0; i < inputs.size(); ++i) {
     EXPECT_EQ(wrapper.GetInfo(AutofillType(inputs[i].type)),
               view->GetTextContentsOfInput(inputs[i]));
@@ skipping 27 matching lines @@
 
   const DetailInputs& inputs =
       controller()->RequestedFieldsForSection(SECTION_CC);
   const DetailInput& triggering_input = inputs[0];
   base::string16 value = card1.GetRawInfo(triggering_input.type);
   TestableAutofillDialogView* view = controller()->GetTestableView();
   view->SetTextContentsOfInput(triggering_input,
                                value.substr(0, value.size() / 2));
   view->ActivateInput(triggering_input);
 
-  ASSERT_EQ(&triggering_input, controller()->input_showing_popup());
+  ASSERT_EQ(triggering_input.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) {
     EXPECT_EQ(wrapper1.GetInfo(AutofillType(inputs[i].type)),
               view->GetTextContentsOfInput(inputs[i]));
   }
 
   // Try again with different data. Only expiration date and the triggering
   // input should be overwritten.
   value = card2.GetRawInfo(triggering_input.type);
   view->SetTextContentsOfInput(triggering_input,
                                value.substr(0, value.size() / 2));
   view->ActivateInput(triggering_input);
-  ASSERT_EQ(&triggering_input, controller()->input_showing_popup());
+  ASSERT_EQ(triggering_input.type, controller()->popup_input_type());
   controller()->DidAcceptSuggestion(base::string16(), 0);
 
   AutofillCreditCardWrapper wrapper2(&card2);
   for (size_t i = 0; i < inputs.size(); ++i) {
     const DetailInput& input = inputs[i];
     if (&input == &triggering_input ||
         input.type == CREDIT_CARD_EXP_MONTH ||
         input.type == CREDIT_CARD_EXP_4_DIGIT_YEAR) {
       EXPECT_EQ(wrapper2.GetInfo(AutofillType(input.type)),
                 view->GetTextContentsOfInput(input));
     } else if (input.type == CREDIT_CARD_VERIFICATION_CODE) {
       EXPECT_TRUE(view->GetTextContentsOfInput(input).empty());
     } else {
       EXPECT_EQ(wrapper1.GetInfo(AutofillType(input.type)),
                 view->GetTextContentsOfInput(input));
     }
   }
 
   // Now fill from a profile. It should not overwrite any CC info.
   const DetailInputs& billing_inputs =
       controller()->RequestedFieldsForSection(SECTION_BILLING);
   const DetailInput& billing_triggering_input = billing_inputs[0];
   value = full_profile.GetRawInfo(triggering_input.type);
   view->SetTextContentsOfInput(billing_triggering_input,
                                value.substr(0, value.size() / 2));
   view->ActivateInput(billing_triggering_input);
 
-  ASSERT_EQ(&billing_triggering_input, controller()->input_showing_popup());
+  ASSERT_EQ(billing_triggering_input.type, controller()->popup_input_type());
   controller()->DidAcceptSuggestion(base::string16(), 0);
 
   for (size_t i = 0; i < inputs.size(); ++i) {
     const DetailInput& input = inputs[i];
     if (&input == &triggering_input ||
         input.type == CREDIT_CARD_EXP_MONTH ||
         input.type == CREDIT_CARD_EXP_4_DIGIT_YEAR) {
       EXPECT_EQ(wrapper2.GetInfo(AutofillType(input.type)),
                 view->GetTextContentsOfInput(input));
     } else if (input.type == CREDIT_CARD_VERIFICATION_CODE) {
@@ skipping 630 matching lines @@
                        MAYBE_DoesntWorkOnBrokenHttps) {
   net::SpawnedTestServer https_server(
       net::SpawnedTestServer::TYPE_HTTPS,
       SSLOptions(SSLOptions::CERT_EXPIRED),
       base::FilePath(FILE_PATH_LITERAL("chrome/test/data")));
   ASSERT_TRUE(https_server.Start());
   EXPECT_FALSE(RunTestPage(https_server));
 }
 
 }  // namespace autofill