Revert 66214 - Display a warning when autofill is disabled for a website....

chrome/browser/autofill/form_structure_unittest.cc

 // Copyright (c) 2010 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/scoped_ptr.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autofill/form_structure.h"
 #include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 181 matching lines @@
                                                ASCIIToUTF16("password"),
                                                string16(),
                                                ASCIIToUTF16("password"),
                                                0));
   form.fields.push_back(webkit_glue::FormField(string16(),
                                                ASCIIToUTF16("Submit"),
                                                string16(),
                                                ASCIIToUTF16("submit"),
                                                0));
   form_structure.reset(new FormStructure(form));
-  EXPECT_FALSE(form_structure->IsAutoFillable(true));
+  EXPECT_FALSE(form_structure->IsAutoFillable());
 
   // We now have three text fields, but only two auto-fillable fields.
   form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("First Name"),
                                                ASCIIToUTF16("firstname"),
                                                string16(),
                                                ASCIIToUTF16("text"),
                                                0));
   form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("Last Name"),
                                                ASCIIToUTF16("lastname"),
                                                string16(),
                                                ASCIIToUTF16("text"),
                                                0));
   form_structure.reset(new FormStructure(form));
-  EXPECT_FALSE(form_structure->IsAutoFillable(true));
+  EXPECT_FALSE(form_structure->IsAutoFillable());
 
   // We now have three auto-fillable fields.
   form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("Email"),
                                                ASCIIToUTF16("email"),
                                                string16(),
                                                ASCIIToUTF16("text"),
                                                0));
   form_structure.reset(new FormStructure(form));
-  EXPECT_TRUE(form_structure->IsAutoFillable(true));
+  EXPECT_TRUE(form_structure->IsAutoFillable());
 
-  // The method must be 'post', though we can intentionally ignore this
-  // criterion for the sake of providing a helpful warning message to the user.
+  // The method must be 'post'.
   form.method = ASCIIToUTF16("get");
   form_structure.reset(new FormStructure(form));
-  EXPECT_FALSE(form_structure->IsAutoFillable(true));
-  EXPECT_TRUE(form_structure->IsAutoFillable(false));
+  EXPECT_FALSE(form_structure->IsAutoFillable());
 
   // The target cannot include http(s)://*/search...
   form.method = ASCIIToUTF16("post");
   form.action = GURL("http://google.com/search?q=hello");
   form_structure.reset(new FormStructure(form));
-  EXPECT_FALSE(form_structure->IsAutoFillable(true));
+  EXPECT_FALSE(form_structure->IsAutoFillable());
 
   // But search can be in the URL.
   form.action = GURL("http://search.com/?q=hello");
   form_structure.reset(new FormStructure(form));
-  EXPECT_TRUE(form_structure->IsAutoFillable(true));
+  EXPECT_TRUE(form_structure->IsAutoFillable());
 }
 
 TEST(FormStructureTest, HeuristicsContactInfo) {
   scoped_ptr<FormStructure> form_structure;
   FormData form;
 
   form.method = ASCIIToUTF16("post");
   form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("First Name"),
                                                ASCIIToUTF16("firstname"),
                                                string16(),
@@ skipping 33 matching lines @@
                                                ASCIIToUTF16("zipcode"),
                                                string16(),
                                                ASCIIToUTF16("text"),
                                                0));
   form.fields.push_back(webkit_glue::FormField(string16(),
                                                ASCIIToUTF16("Submit"),
                                                string16(),
                                                ASCIIToUTF16("submit"),
                                                0));
   form_structure.reset(new FormStructure(form));
-  EXPECT_TRUE(form_structure->IsAutoFillable(true));
+  EXPECT_TRUE(form_structure->IsAutoFillable());
 
   // Expect the correct number of fields.
   ASSERT_EQ(9U, form_structure->field_count());
   ASSERT_EQ(8U, form_structure->autofill_count());
 
   // First name.
   EXPECT_EQ(NAME_FIRST, form_structure->field(0)->heuristic_type());
   // Last name.
   EXPECT_EQ(NAME_LAST, form_structure->field(1)->heuristic_type());
   // Email.
@@ skipping 97 matching lines @@
                                                ASCIIToUTF16("hidden8"),
                                                string16(),
                                                ASCIIToUTF16("hidden"),
                                                0));
   form.fields.push_back(webkit_glue::FormField(string16(),
                                                ASCIIToUTF16("Submit"),
                                                string16(),
                                                ASCIIToUTF16("submit"),
                                                0));
   form_structure.reset(new FormStructure(form));
-  EXPECT_TRUE(form_structure->IsAutoFillable(true));
+  EXPECT_TRUE(form_structure->IsAutoFillable());
 
   // Expect the correct number of fields.
   ASSERT_EQ(17U, form_structure->field_count());
   ASSERT_EQ(8U, form_structure->autofill_count());
 
   // First name.
   EXPECT_EQ(NAME_FIRST, form_structure->field(0)->heuristic_type());
   // Last name.
   EXPECT_EQ(NAME_LAST, form_structure->field(2)->heuristic_type());
   // Email.
@@ skipping 72 matching lines @@
                              string16(),
                              ASCIIToUTF16("text"),
                              0));
   form.fields.push_back(
       webkit_glue::FormField(string16(),
                              ASCIIToUTF16("Submit"),
                              string16(),
                              ASCIIToUTF16("submit"),
                              0));
   form_structure.reset(new FormStructure(form));
-  EXPECT_TRUE(form_structure->IsAutoFillable(true));
+  EXPECT_TRUE(form_structure->IsAutoFillable());
   ASSERT_EQ(10U, form_structure->field_count());
   ASSERT_EQ(9U, form_structure->autofill_count());
 
   // First name.
   EXPECT_EQ(NAME_FIRST, form_structure->field(0)->heuristic_type());
   // Last name.
   EXPECT_EQ(NAME_LAST, form_structure->field(1)->heuristic_type());
   // Address.
   EXPECT_EQ(ADDRESS_BILLING_LINE1, form_structure->field(2)->heuristic_type());
   // Address.
@@ skipping 57 matching lines @@
                              ASCIIToUTF16("text"),
                              0));
   // TODO(jhawkins): Phone number.
   form.fields.push_back(
       webkit_glue::FormField(string16(),
                              ASCIIToUTF16("Submit"),
                              ASCIIToUTF16("continue"),
                              ASCIIToUTF16("submit"),
                              0));
   form_structure.reset(new FormStructure(form));
-  EXPECT_TRUE(form_structure->IsAutoFillable(true));
+  EXPECT_TRUE(form_structure->IsAutoFillable());
   ASSERT_EQ(7U, form_structure->field_count());
   ASSERT_EQ(6U, form_structure->autofill_count());
 
   // Email.
   EXPECT_EQ(EMAIL_ADDRESS, form_structure->field(0)->heuristic_type());
   // Full name.
   EXPECT_EQ(NAME_FULL, form_structure->field(1)->heuristic_type());
   // Company
   EXPECT_EQ(COMPANY_NAME, form_structure->field(2)->heuristic_type());
   // Address.
@@ skipping 53 matching lines @@
                                                string16(),
                                                string16(),
                                                ASCIIToUTF16("text"),
                                                0));
   form.fields.push_back(webkit_glue::FormField(string16(),
                                                ASCIIToUTF16("Submit"),
                                                string16(),
                                                ASCIIToUTF16("submit"),
                                                0));
   form_structure.reset(new FormStructure(form));
-  EXPECT_TRUE(form_structure->IsAutoFillable(true));
+  EXPECT_TRUE(form_structure->IsAutoFillable());
   ASSERT_EQ(9U, form_structure->field_count());
   ASSERT_EQ(8U, form_structure->autofill_count());
 
   // First name.
   EXPECT_EQ(NAME_FIRST, form_structure->field(0)->heuristic_type());
   // Last name.
   EXPECT_EQ(NAME_LAST, form_structure->field(1)->heuristic_type());
   // Email.
   EXPECT_EQ(EMAIL_ADDRESS, form_structure->field(2)->heuristic_type());
   // Phone.
@@ skipping 40 matching lines @@
                                                ASCIIToUTF16("verification"),
                                                string16(),
                                                ASCIIToUTF16("text"),
                                                0));
   form.fields.push_back(webkit_glue::FormField(string16(),
                                                ASCIIToUTF16("Submit"),
                                                string16(),
                                                ASCIIToUTF16("submit"),
                                                0));
   form_structure.reset(new FormStructure(form));
-  EXPECT_TRUE(form_structure->IsAutoFillable(true));
+  EXPECT_TRUE(form_structure->IsAutoFillable());
   ASSERT_EQ(6U, form_structure->field_count());
   ASSERT_EQ(4U, form_structure->autofill_count());
 
   // Credit card name.
   EXPECT_EQ(CREDIT_CARD_NAME, form_structure->field(0)->heuristic_type());
   // Credit card number.
   EXPECT_EQ(CREDIT_CARD_NUMBER, form_structure->field(1)->heuristic_type());
   // Credit card expiration month.
   EXPECT_EQ(CREDIT_CARD_EXP_MONTH, form_structure->field(2)->heuristic_type());
   // Credit card expiration year.
@@ skipping 41 matching lines @@
                                                ASCIIToUTF16("verification"),
                                                string16(),
                                                ASCIIToUTF16("text"),
                                                0));
   form.fields.push_back(webkit_glue::FormField(string16(),
                                                ASCIIToUTF16("Submit"),
                                                string16(),
                                                ASCIIToUTF16("submit"),
                                                0));
   form_structure.reset(new FormStructure(form));
-  EXPECT_TRUE(form_structure->IsAutoFillable(true));
+  EXPECT_TRUE(form_structure->IsAutoFillable());
   ASSERT_EQ(7U, form_structure->field_count());
   ASSERT_EQ(4U, form_structure->autofill_count());
 
   // Credit card name.
   EXPECT_EQ(CREDIT_CARD_NAME, form_structure->field(0)->heuristic_type());
   // Credit card type.  This is an unknown type but related to the credit card.
   EXPECT_EQ(UNKNOWN_TYPE, form_structure->field(1)->heuristic_type());
   // Credit card number.
   EXPECT_EQ(CREDIT_CARD_NUMBER, form_structure->field(2)->heuristic_type());
   // Credit card expiration month.
@@ skipping 30 matching lines @@
                              string16(),
                              ASCIIToUTF16("text"),
                              0));
   form.fields.push_back(
       webkit_glue::FormField(ASCIIToUTF16("City"),
                              ASCIIToUTF16("city"),
                              string16(),
                              ASCIIToUTF16("text"),
                              0));
   form_structure.reset(new FormStructure(form));
-  EXPECT_TRUE(form_structure->IsAutoFillable(true));
+  EXPECT_TRUE(form_structure->IsAutoFillable());
   ASSERT_EQ(4U, form_structure->field_count());
   ASSERT_EQ(3U, form_structure->autofill_count());
 
   // Address Line 1.
   EXPECT_EQ(ADDRESS_HOME_LINE1, form_structure->field(0)->heuristic_type());
   // Address Line 2.
   EXPECT_EQ(ADDRESS_HOME_LINE2, form_structure->field(1)->heuristic_type());
   // Address Line 3.
   EXPECT_EQ(UNKNOWN_TYPE, form_structure->field(2)->heuristic_type());
   // City.
@@ skipping 25 matching lines @@
                              string16(),
                              ASCIIToUTF16("text"),
                              0));
   form.fields.push_back(
       webkit_glue::FormField(ASCIIToUTF16("Address Line2"),
                              ASCIIToUTF16("billing.address.addressLine2"),
                              string16(),
                              ASCIIToUTF16("text"),
                              0));
   form_structure.reset(new FormStructure(form));
-  EXPECT_TRUE(form_structure->IsAutoFillable(true));
+  EXPECT_TRUE(form_structure->IsAutoFillable());
   ASSERT_EQ(4U, form_structure->field_count());
   ASSERT_EQ(4U, form_structure->autofill_count());
 
   // Address Line 1.
   EXPECT_EQ(ADDRESS_HOME_LINE1, form_structure->field(0)->heuristic_type());
   // Address Line 2.
   EXPECT_EQ(ADDRESS_HOME_LINE2, form_structure->field(1)->heuristic_type());
   // Address Line 1.
   EXPECT_EQ(ADDRESS_BILLING_LINE1, form_structure->field(2)->heuristic_type());
   // Address Line 2.
@@ skipping 29 matching lines @@
                              string16(),
                              ASCIIToUTF16("text"),
                              0));
   form.fields.push_back(
       webkit_glue::FormField(ASCIIToUTF16("City:"),
                              ASCIIToUTF16("FOPIH_RgWebCC_0_IHAddress_adct"),
                              string16(),
                              ASCIIToUTF16("text"),
                              0));
   form_structure.reset(new FormStructure(form));
-  EXPECT_TRUE(form_structure->IsAutoFillable(true));
+  EXPECT_TRUE(form_structure->IsAutoFillable());
   ASSERT_EQ(4U, form_structure->field_count());
   ASSERT_EQ(3U, form_structure->autofill_count());
 
   // Address Line 1.
   EXPECT_EQ(ADDRESS_HOME_LINE1, form_structure->field(0)->heuristic_type());
   // Suite / Apt.
   EXPECT_EQ(ADDRESS_HOME_LINE2, form_structure->field(1)->heuristic_type());
   // Address Line 3.
   EXPECT_EQ(UNKNOWN_TYPE, form_structure->field(2)->heuristic_type());
   // City.
@@ skipping 20 matching lines @@
                              string16(),
                              ASCIIToUTF16("text"),
                              0));
   form.fields.push_back(
       webkit_glue::FormField(ASCIIToUTF16("City"),
                              ASCIIToUTF16("city"),
                              string16(),
                              ASCIIToUTF16("text"),
                              0));
   form_structure.reset(new FormStructure(form));
-  EXPECT_TRUE(form_structure->IsAutoFillable(true));
+  EXPECT_TRUE(form_structure->IsAutoFillable());
   ASSERT_EQ(3U, form_structure->field_count());
   ASSERT_EQ(3U, form_structure->autofill_count());
 
   // Address Line 1.
   EXPECT_EQ(ADDRESS_HOME_LINE1, form_structure->field(0)->heuristic_type());
   // Address Line 2.
   EXPECT_EQ(ADDRESS_HOME_LINE2, form_structure->field(1)->heuristic_type());
   // City.
   EXPECT_EQ(ADDRESS_HOME_CITY, form_structure->field(2)->heuristic_type());
 }
@@ skipping 15 matching lines @@
                              string16(),
                              ASCIIToUTF16("text"),
                              0));
   form.fields.push_back(
       webkit_glue::FormField(ASCIIToUTF16("State/Province/Region"),
                              ASCIIToUTF16("State"),
                              string16(),
                              ASCIIToUTF16("text"),
                              0));
   form_structure.reset(new FormStructure(form));
-  EXPECT_TRUE(form_structure->IsAutoFillable(true));
+  EXPECT_TRUE(form_structure->IsAutoFillable());
   ASSERT_EQ(3U, form_structure->field_count());
   ASSERT_EQ(3U, form_structure->autofill_count());
 
   // Address Line 1.
   EXPECT_EQ(ADDRESS_HOME_LINE1, form_structure->field(0)->heuristic_type());
   // Address Line 2.
   EXPECT_EQ(ADDRESS_HOME_LINE2, form_structure->field(1)->heuristic_type());
   // State.
   EXPECT_EQ(ADDRESS_HOME_STATE, form_structure->field(2)->heuristic_type());
 }
@@ skipping 64 matching lines @@
                              string16(),
                              ASCIIToUTF16("text"),
                              0));
   form.fields.push_back(
       webkit_glue::FormField(ASCIIToUTF16("Email Address*:"),
                              ASCIIToUTF16("email$emailBox"),
                              string16(),
                              ASCIIToUTF16("text"),
                              0));
   form_structure.reset(new FormStructure(form));
-  EXPECT_TRUE(form_structure->IsAutoFillable(true));
+  EXPECT_TRUE(form_structure->IsAutoFillable());
   ASSERT_EQ(11U, form_structure->field_count());
   ASSERT_EQ(11U, form_structure->autofill_count());
 
   EXPECT_EQ(NAME_FIRST, form_structure->field(0)->heuristic_type());
   EXPECT_EQ(NAME_LAST, form_structure->field(1)->heuristic_type());
   EXPECT_EQ(COMPANY_NAME, form_structure->field(2)->heuristic_type());
   EXPECT_EQ(ADDRESS_BILLING_LINE1, form_structure->field(3)->heuristic_type());
   EXPECT_EQ(ADDRESS_BILLING_LINE2, form_structure->field(4)->heuristic_type());
   EXPECT_EQ(ADDRESS_BILLING_CITY, form_structure->field(5)->heuristic_type());
   EXPECT_EQ(ADDRESS_BILLING_STATE, form_structure->field(6)->heuristic_type());
@@ skipping 28 matching lines @@
                              string16(),
                              ASCIIToUTF16("text"),
                              0));
   form.fields.push_back(
       webkit_glue::FormField(ASCIIToUTF16("ext.:"),
                              ASCIIToUTF16("dayphone4"),
                              string16(),
                              ASCIIToUTF16("text"),
                              0));
   form_structure.reset(new FormStructure(form));
-  EXPECT_TRUE(form_structure->IsAutoFillable(true));
+  EXPECT_TRUE(form_structure->IsAutoFillable());
   ASSERT_EQ(4U, form_structure->field_count());
   ASSERT_EQ(3U, form_structure->autofill_count());
 
   // Area code.
   EXPECT_EQ(PHONE_HOME_CITY_CODE, form_structure->field(0)->heuristic_type());
   // Phone number suffix.
   EXPECT_EQ(PHONE_HOME_NUMBER,
             form_structure->field(1)->heuristic_type());
   // Phone number suffix.
   EXPECT_EQ(PHONE_HOME_NUMBER,
@@ skipping 50 matching lines @@
                                                ASCIIToUTF16("state"),
                                                string16(),
                                                ASCIIToUTF16("hidden"),
                                                0));
   form.fields.push_back(webkit_glue::FormField(string16(),
                                                ASCIIToUTF16("Submit"),
                                                string16(),
                                                ASCIIToUTF16("submit"),
                                                0));
   form_structure.reset(new FormStructure(form));
-  EXPECT_TRUE(form_structure->IsAutoFillable(true));
+  EXPECT_TRUE(form_structure->IsAutoFillable());
 
   // Expect the correct number of fields.
   ASSERT_EQ(10U, form_structure->field_count());
   ASSERT_EQ(6U, form_structure->autofill_count());
 
   // First name.
   EXPECT_EQ(NAME_FIRST, form_structure->field(0)->heuristic_type());
   // Last name.
   EXPECT_EQ(NAME_LAST, form_structure->field(1)->heuristic_type());
   // Email.
@@ skipping 38 matching lines @@
                                                ASCIIToUTF16("expiration_month"),
                                                string16(),
                                                ASCIIToUTF16("text"),
                                                0));
   form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("Expiration Year"),
                                                ASCIIToUTF16("expiration_year"),
                                                string16(),
                                                ASCIIToUTF16("text"),
                                                0));
   form_structure.reset(new FormStructure(form));
-  EXPECT_TRUE(form_structure->IsAutoFillable(true));
+  EXPECT_TRUE(form_structure->IsAutoFillable());
 
   // Expect the correct number of fields.
   ASSERT_EQ(5U, form_structure->field_count());
   ASSERT_EQ(5U, form_structure->autofill_count());
 
   // Name on Card.
   EXPECT_EQ(CREDIT_CARD_NAME, form_structure->field(0)->heuristic_type());
   // Address.
   EXPECT_EQ(ADDRESS_BILLING_LINE1, form_structure->field(1)->heuristic_type());
   // Card Number.
@@ skipping 259 matching lines @@
   }
   form_structure.reset(new FormStructure(form));
   ASSERT_EQ(form_structure->field_count(), possible_field_types.size());
   for (size_t i = 0; i < form_structure->field_count(); ++i)
     form_structure->set_possible_types(i, possible_field_types[i]);
   EXPECT_FALSE(form_structure->EncodeUploadRequest(false, &encoded_xml));
   EXPECT_EQ(encoded_xml, "");
 }
 
 }  // namespace