rAc: Get rid of dialog type in rAc, there is only one type left now.

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/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 29 matching lines @@
 
 namespace autofill {
 
 namespace {
 
 void MockCallback(const FormStructure*, const std::string&) {}
 
 class MockAutofillMetrics : public AutofillMetrics {
  public:
   MockAutofillMetrics()
-      : dialog_type_(static_cast<DialogType>(-1)),
-        dialog_dismissal_action_(
+      : dialog_dismissal_action_(
             static_cast<AutofillMetrics::DialogDismissalAction>(-1)) {}
   virtual ~MockAutofillMetrics() {}
 
   virtual void LogDialogUiDuration(
       const base::TimeDelta& duration,
-      DialogType dialog_type,
       DialogDismissalAction dismissal_action) const OVERRIDE {
     // Ignore constness for testing.
     MockAutofillMetrics* mutable_this = const_cast<MockAutofillMetrics*>(this);
-    mutable_this->dialog_type_ = dialog_type;
     mutable_this->dialog_dismissal_action_ = dismissal_action;
   }
 
-  DialogType dialog_type() const { return dialog_type_; }
   AutofillMetrics::DialogDismissalAction dialog_dismissal_action() const {
     return dialog_dismissal_action_;
   }
 
-  MOCK_CONST_METHOD2(LogDialogDismissalState,
-                     void(DialogType dialog_type, DialogDismissalState state));
+  MOCK_CONST_METHOD1(LogDialogDismissalState,
+                     void(DialogDismissalState state));
 
  private:
-  DialogType dialog_type_;
   AutofillMetrics::DialogDismissalAction dialog_dismissal_action_;
 
   DISALLOW_COPY_AND_ASSIGN(MockAutofillMetrics);
 };
 
 class TestAutofillDialogController : public AutofillDialogControllerImpl {
  public:
   TestAutofillDialogController(content::WebContents* contents,
                                const FormData& form_data,
                                const AutofillMetrics& metric_logger,
-                               scoped_refptr<content::MessageLoopRunner> runner,
-                               const DialogType dialog_type)
+                               scoped_refptr<content::MessageLoopRunner> runner)
       : AutofillDialogControllerImpl(contents,
                                      form_data,
                                      GURL(),
-                                     dialog_type,
                                      base::Bind(&MockCallback)),
         metric_logger_(metric_logger),
         mock_wallet_client_(
             Profile::FromBrowserContext(contents->GetBrowserContext())->
                 GetRequestContext(), this),
         message_loop_runner_(runner),
         use_validation_(false),
         weak_ptr_factory_(this) {}
 
   virtual ~TestAutofillDialogController() {}
@@ skipping 100 matching lines @@
 
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
 #if defined(OS_MACOSX)
     // OSX support for requestAutocomplete is still hidden behind a switch.
     // Pending resolution of http://crbug.com/157274
     CommandLine::ForCurrentProcess()->AppendSwitch(
         switches::kEnableInteractiveAutocomplete);
 #endif
   }
 
-  void InitializeControllerOfType(DialogType dialog_type) {
+  void InitializeControllerOfType() {

[Ilya Sherman, 2013/09/03 20:57:05]

nit: Rename to InitializeController()

[Evan Stade, 2013/09/03 20:57:36]

this fn name no longer makes sense. Also, you should just call it from the
constructor instead of on the first line of each test.

[Raman Kakilate, 2013/09/03 21:50:31]

Done.

[Raman Kakilate, 2013/09/03 21:50:31]

Done.

     FormData form;
     form.name = ASCIIToUTF16("TestForm");
     form.method = ASCIIToUTF16("POST");
     form.origin = GURL("http://example.com/form.html");
     form.action = GURL("http://example.com/submit.html");
     form.user_submitted = true;
 
     FormFieldData field;
     field.autocomplete_attribute = "shipping tel";
     form.fields.push_back(field);
 
     message_loop_runner_ = new content::MessageLoopRunner;
     controller_ = new TestAutofillDialogController(
         GetActiveWebContents(),
         form,
         metric_logger_,
-        message_loop_runner_,
-        dialog_type);
+        message_loop_runner_);
     controller_->Show();
   }
 
   content::WebContents* GetActiveWebContents() {
     return browser()->tab_strip_model()->GetActiveWebContents();
   }
 
   const MockAutofillMetrics& metric_logger() { return metric_logger_; }
   TestAutofillDialogController* controller() { return controller_; }
 
@@ skipping 80 matching lines @@
   MockAutofillMetrics metric_logger_;
   TestAutofillDialogController* controller_;  // Weak reference.
   scoped_refptr<content::MessageLoopRunner> message_loop_runner_;
   scoped_ptr<content::DOMMessageQueue> dom_message_queue_;
   DISALLOW_COPY_AND_ASSIGN(AutofillDialogControllerTest);
 };
 
 #if defined(TOOLKIT_VIEWS) || defined(OS_MACOSX)
 // Submit the form data.
 IN_PROC_BROWSER_TEST_F(AutofillDialogControllerTest, Submit) {
-  InitializeControllerOfType(DIALOG_TYPE_REQUEST_AUTOCOMPLETE);
+  InitializeControllerOfType();
   controller()->GetTestableView()->SubmitForTesting();
 
   RunMessageLoop();
 
   EXPECT_EQ(AutofillMetrics::DIALOG_ACCEPTED,
             metric_logger().dialog_dismissal_action());
-  EXPECT_EQ(DIALOG_TYPE_REQUEST_AUTOCOMPLETE, metric_logger().dialog_type());
 }
 
 // Cancel out of the dialog.
 IN_PROC_BROWSER_TEST_F(AutofillDialogControllerTest, Cancel) {
-  InitializeControllerOfType(DIALOG_TYPE_REQUEST_AUTOCOMPLETE);
+  InitializeControllerOfType();
   controller()->GetTestableView()->CancelForTesting();
 
   RunMessageLoop();
 
   EXPECT_EQ(AutofillMetrics::DIALOG_CANCELED,
             metric_logger().dialog_dismissal_action());
-  EXPECT_EQ(DIALOG_TYPE_REQUEST_AUTOCOMPLETE, metric_logger().dialog_type());
 }
 
 // Take some other action that dismisses the dialog.
 IN_PROC_BROWSER_TEST_F(AutofillDialogControllerTest, Hide) {
-  InitializeControllerOfType(DIALOG_TYPE_REQUEST_AUTOCOMPLETE);
+  InitializeControllerOfType();
   controller()->Hide();
 
   RunMessageLoop();
 
   EXPECT_EQ(AutofillMetrics::DIALOG_CANCELED,
             metric_logger().dialog_dismissal_action());
-  EXPECT_EQ(DIALOG_TYPE_REQUEST_AUTOCOMPLETE, metric_logger().dialog_type());
 }
 
 // Ensure that Hide() will only destroy the controller object after the
 // message loop has run. Otherwise, there may be read-after-free issues
 // during some tests.
 IN_PROC_BROWSER_TEST_F(AutofillDialogControllerTest, DeferredDestruction) {
-  InitializeControllerOfType(DIALOG_TYPE_REQUEST_AUTOCOMPLETE);
+  InitializeControllerOfType();
 
   base::WeakPtr<TestAutofillDialogController> weak_ptr =
       controller()->AsWeakPtr();
   EXPECT_TRUE(weak_ptr.get());
 
   controller()->Hide();
   EXPECT_TRUE(weak_ptr.get());
 
   RunMessageLoop();
   EXPECT_FALSE(weak_ptr.get());
 }
 
 // Ensure that the expected metric is logged when the dialog is closed during
 // signin.
 IN_PROC_BROWSER_TEST_F(AutofillDialogControllerTest, CloseDuringSignin) {
-  InitializeControllerOfType(DIALOG_TYPE_REQUEST_AUTOCOMPLETE);
+  InitializeControllerOfType();
   controller()->SignInLinkClicked();
 
   EXPECT_CALL(metric_logger(),
               LogDialogDismissalState(
-                  DIALOG_TYPE_REQUEST_AUTOCOMPLETE,
                   AutofillMetrics::DIALOG_CANCELED_DURING_SIGNIN));
   controller()->GetTestableView()->CancelForTesting();
 
   RunMessageLoop();
 
   EXPECT_EQ(AutofillMetrics::DIALOG_CANCELED,
             metric_logger().dialog_dismissal_action());
-  EXPECT_EQ(DIALOG_TYPE_REQUEST_AUTOCOMPLETE, metric_logger().dialog_type());
 }
 
 IN_PROC_BROWSER_TEST_F(AutofillDialogControllerTest, FillInputFromAutofill) {
-  InitializeControllerOfType(DIALOG_TYPE_REQUEST_AUTOCOMPLETE);
+  InitializeControllerOfType();
 
   AutofillProfile full_profile(test::GetFullProfile());
   controller()->GetTestingManager()->AddTestingProfile(&full_profile);
 
   const DetailInputs& inputs =
       controller()->RequestedFieldsForSection(SECTION_SHIPPING);
   const DetailInput& triggering_input = inputs[0];
   string16 value = full_profile.GetRawInfo(triggering_input.type);
   TestableAutofillDialogView* view = controller()->GetTestableView();
   view->SetTextContentsOfInput(triggering_input,
@@ skipping 40 matching lines @@
 // Flaky on Win7, WinXP, and Win Aura.  http://crbug.com/270314.
 // TODO(groby): Enable this test on mac once AutofillDialogCocoa handles
 // comboboxes for GetTextContentsForInput. http://crbug.com/270205
 #if defined(OS_MACOSX) || defined(OS_WIN)
 #define MAYBE_FillComboboxFromAutofill DISABLED_FillComboboxFromAutofill
 #else
 #define MAYBE_FillComboboxFromAutofill FillComboboxFromAutofill
 #endif
 IN_PROC_BROWSER_TEST_F(AutofillDialogControllerTest,
                        MAYBE_FillComboboxFromAutofill) {
-  InitializeControllerOfType(DIALOG_TYPE_REQUEST_AUTOCOMPLETE);
+  InitializeControllerOfType();
 
   CreditCard card1;
   test::SetCreditCardInfo(&card1, "JJ Smith", "4111111111111111", "12", "2018");
   controller()->GetTestingManager()->AddTestingCreditCard(&card1);
   CreditCard card2;
   test::SetCreditCardInfo(&card2, "B Bird", "3111111111111111", "11", "2017");
   controller()->GetTestingManager()->AddTestingCreditCard(&card2);
   AutofillProfile full_profile(test::GetFullProfile());
   controller()->GetTestingManager()->AddTestingProfile(&full_profile);
 
@@ skipping 64 matching lines @@
       EXPECT_TRUE(view->GetTextContentsOfInput(input).empty());
     } else {
       EXPECT_EQ(wrapper1.GetInfo(AutofillType(input.type)),
                 view->GetTextContentsOfInput(input));
     }
   }
 }
 
 // Tests that credit card number is disabled while editing a Wallet instrument.
 IN_PROC_BROWSER_TEST_F(AutofillDialogControllerTest, WalletCreditCardDisabled) {
-  InitializeControllerOfType(DIALOG_TYPE_REQUEST_AUTOCOMPLETE);
+  InitializeControllerOfType();
   controller()->OnUserNameFetchSuccess("user@example.com");
 
   scoped_ptr<wallet::WalletItems> wallet_items = wallet::GetTestWalletItems();
   wallet_items->AddInstrument(wallet::GetTestMaskedInstrument());
   controller()->OnDidGetWalletItems(wallet_items.Pass());
 
   // Click "Edit" in the billing section (while using Wallet).
   controller()->EditClickedForSection(SECTION_CC_BILLING);
 
   const DetailInputs& edit_inputs =
@@ skipping 17 matching lines @@
     if (add_inputs[i].type == CREDIT_CARD_NUMBER) {
       EXPECT_TRUE(add_inputs[i].editable);
       break;
     }
   }
   ASSERT_LT(i, add_inputs.size());
 }
 
 // Ensure that expired cards trigger invalid suggestions.
 IN_PROC_BROWSER_TEST_F(AutofillDialogControllerTest, ExpiredCard) {
-  InitializeControllerOfType(DIALOG_TYPE_REQUEST_AUTOCOMPLETE);
+  InitializeControllerOfType();
 
   CreditCard verified_card(test::GetCreditCard());
   verified_card.set_origin("Chrome settings");
   ASSERT_TRUE(verified_card.IsVerified());
   controller()->GetTestingManager()->AddTestingCreditCard(&verified_card);
 
   CreditCard expired_card(test::GetCreditCard());
   expired_card.set_origin("Chrome settings");
   expired_card.SetRawInfo(CREDIT_CARD_EXP_4_DIGIT_YEAR, ASCIIToUTF16("2007"));
   ASSERT_TRUE(expired_card.IsVerified());
@@ skipping 10 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) {
-  InitializeControllerOfType(DIALOG_TYPE_REQUEST_AUTOCOMPLETE);
+  InitializeControllerOfType();
 
   const gfx::Size no_notification_size =
       controller()->GetTestableView()->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 "
@@ skipping 43 matching lines @@
 }
 
 IN_PROC_BROWSER_TEST_F(AutofillDialogControllerTest,
                        AutocompleteErrorEventReasonCancel) {
   SetUpHtmlAndInvoke("<input autocomplete='cc-name'>")->GetTestableView()->
       CancelForTesting();
   ExpectDomMessage("error: cancel");
 }
 
 IN_PROC_BROWSER_TEST_F(AutofillDialogControllerTest, NoCvcSegfault) {
-  InitializeControllerOfType(DIALOG_TYPE_REQUEST_AUTOCOMPLETE);
+  InitializeControllerOfType();
   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());
 }
 
 // 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) {
-  InitializeControllerOfType(DIALOG_TYPE_REQUEST_AUTOCOMPLETE);
+  InitializeControllerOfType();
   controller()->set_use_validation(true);
 
   // Set up some Autofill state.
   CreditCard credit_card(test::GetVerifiedCreditCard());
   controller()->GetTestingManager()->AddTestingCreditCard(&credit_card);
 
   AutofillProfile profile(test::GetVerifiedProfile());
   controller()->GetTestingManager()->AddTestingProfile(&profile);
 
   EXPECT_TRUE(controller()->SectionIsActive(SECTION_CC));
@@ skipping 60 matching lines @@
   EXPECT_EQ(cc_number.type, new_cc_number.type);
   EXPECT_EQ(ASCIIToUTF16("4111111111111111"),
             view->GetTextContentsOfInput(new_cc_number));
 
   EXPECT_NE(ASCIIToUTF16("shipping name"),
             view->GetTextContentsOfInput(shipping_zip));
 }
 #endif  // defined(TOOLKIT_VIEWS) || defined(OS_MACOSX)
 
 }  // namespace autofill