Autofill: Set requirements for number of recognized fields in an autofillable form

components/autofill/core/browser/form_structure_unittest.cc

 // Copyright 2013 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 "components/autofill/core/browser/form_structure.h"
 
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 76 matching lines @@
   field.label = ASCIIToUTF16("username");
   field.name = ASCIIToUTF16("username");
   field.form_control_type = "text";
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("password");
   field.name = ASCIIToUTF16("password");
   field.form_control_type = "password";
   form.fields.push_back(field);
 
+  field.label = ASCIIToUTF16("email");
+  field.name = ASCIIToUTF16("email");
+  field.form_control_type = "text";
+  form.fields.push_back(field);
+
+  field.label = ASCIIToUTF16("city");
+  field.name = ASCIIToUTF16("city");
+  field.form_control_type = "text";
+  form.fields.push_back(field);
+
   field.label = ASCIIToUTF16("state");
   field.name = ASCIIToUTF16("state");
   field.form_control_type = "select-one";
   form.fields.push_back(field);
 
   field.label = base::string16();
   field.name = ASCIIToUTF16("Submit");
   field.form_control_type = "submit";
   form.fields.push_back(field);
 
   // Only text and select fields that are heuristically matched are counted.
   form_structure.reset(new FormStructure(form));
   form_structure->DetermineHeuristicTypes();
-  EXPECT_EQ(1U, form_structure->autofill_count());
+  EXPECT_EQ(3U, form_structure->autofill_count());
 
   // Add a field with should_autocomplete=false. This should not be considered a
   // fillable field.
   field.label = ASCIIToUTF16("address1");
   field.name = ASCIIToUTF16("address1");
   field.form_control_type = "text";
   field.should_autocomplete = false;
   form.fields.push_back(field);
 
   form_structure.reset(new FormStructure(form));
   form_structure->DetermineHeuristicTypes();
-  EXPECT_EQ(2U, form_structure->autofill_count());
+  EXPECT_EQ(4U, form_structure->autofill_count());
 
   base::CommandLine::ForCurrentProcess()->AppendSwitch(
       switches::kRespectAutocompleteOffForAutofill);
 
   form_structure.reset(new FormStructure(form));
   form_structure->DetermineHeuristicTypes();
-  EXPECT_EQ(1U, form_structure->autofill_count());
+  EXPECT_EQ(3U, form_structure->autofill_count());
 }
 
 TEST(FormStructureTest, SourceURL) {
   FormData form;
   form.origin = GURL("http://www.foo.com/");
   FormStructure form_structure(form);
 
   EXPECT_EQ(form.origin, form_structure.source_url());
 }
 
@@ skipping 2110 matching lines @@
   field.name = ASCIIToUTF16("1random12345678");
   form.fields.push_back(field);
   field.label = ASCIIToUTF16("Random Field label3");
   field.name = ASCIIToUTF16("12345random");
   form.fields.push_back(field);
   form_structure.reset(new FormStructure(form));
   EXPECT_EQ(FormStructureTest::Hash64Bit(
       std::string("https://login.facebook.com&login_form&email&first&"
                   "random1234&random&1random&random")),
       form_structure->FormSignature());
-
 }
 
 TEST(FormStructureTest, ToFormData) {
   FormData form;
   form.name = ASCIIToUTF16("the-name");
   form.origin = GURL("http://cool.com");
   form.action = form.origin.Resolve("/login");
 
   FormFieldData field;
   field.label = ASCIIToUTF16("username");
@@ skipping 142 matching lines @@
   std::string response =
       "<autofillqueryresponse>"
       "<field autofilltype=\"7\" />"
       "<field autofilltype=\"30\" />"
       "<field autofilltype=\"9\" />"
       "<field autofilltype=\"0\" />"
       "</autofillqueryresponse>";
 
   FormStructure::ParseQueryResponse(response, forms.get());
 
+  ASSERT_GE(forms[0]->field_count(), 2U);
+  ASSERT_GE(forms[1]->field_count(), 2U);
   EXPECT_EQ(7, forms[0]->field(0)->server_type());
   EXPECT_EQ(30, forms[0]->field(1)->server_type());
   EXPECT_EQ(9, forms[1]->field(0)->server_type());
   EXPECT_EQ(0, forms[1]->field(1)->server_type());
 }
 
 // If user defined types are present, only parse password fields.
 TEST(FormStructureTest, ParseQueryResponseAuthorDefinedTypes) {
   FormData form;
   FormFieldData field;
@@ skipping 15 matching lines @@
   forms.front()->DetermineHeuristicTypes();
 
   std::string response =
       "<autofillqueryresponse>"
       "<field autofilltype=\"9\" />"
       "<field autofilltype=\"76\" />"
       "</autofillqueryresponse>";
 
   FormStructure::ParseQueryResponse(response, forms.get());
 
+  ASSERT_GE(forms[0]->field_count(), 2U);
   EXPECT_EQ(NO_SERVER_DATA, forms[0]->field(0)->server_type());
   EXPECT_EQ(76, forms[0]->field(1)->server_type());
 }
 
 }  // namespace autofill