[Autofill] Add a separate enumeration for HTML field type hints.

components/autofill/core/browser/autofill_manager_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 <algorithm>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 504 matching lines @@
                 "Field %d with value %s", static_cast<int>(i),
                 UTF16ToUTF8(submitted_form->field(i)->value).c_str()));
         const ServerFieldTypeSet& possible_types =
             submitted_form->field(i)->possible_types();
         EXPECT_EQ(expected_submitted_field_types_[i].size(),
                   possible_types.size());
         for (ServerFieldTypeSet::const_iterator it =
                  expected_submitted_field_types_[i].begin();
              it != expected_submitted_field_types_[i].end(); ++it) {
           EXPECT_TRUE(possible_types.count(*it))
-              << "Expected type: " << AutofillType::FieldTypeToString(*it);
+              << "Expected type: " << AutofillType(*it).ToString();
         }
       }
     }
 
     AutofillManager::UploadFormDataAsyncCallback(submitted_form,
                                                  load_time,
                                                  interaction_time,
                                                  submission_time);
   }
 
@@ skipping 2109 matching lines @@
   // Simulate having seen this form on page load.
   // |form_structure| will be owned by |autofill_manager_|.
   TestFormStructure* form_structure = new TestFormStructure(form);
   AutofillMetrics metrics_logger;  // ignored
   form_structure->DetermineHeuristicTypes(metrics_logger);
 
   // Clear the heuristic types, and instead set the appropriate server types.
   std::vector<ServerFieldType> heuristic_types, server_types;
   for (size_t i = 0; i < form.fields.size(); ++i) {
     heuristic_types.push_back(UNKNOWN_TYPE);
-    server_types.push_back(form_structure->field(i)->Type().server_type());
+    server_types.push_back(form_structure->field(i)->heuristic_type());
   }
   form_structure->SetFieldTypes(heuristic_types, server_types);
   autofill_manager_->AddSeenForm(form_structure);
 
   // Fill the form.
   GUIDPair guid("00000000-0000-0000-0000-000000000001", 0);
   GUIDPair empty(std::string(), 0);
   int response_page_id = 0;
   FormData response_data;
   FillAutofillFormDataAndSaveResults(kDefaultPageID, form, form.fields[0],
@@ skipping 493 matching lines @@
   test::CreateTestAddressFormData(&form);
 
   TestFormStructure* form_structure = new TestFormStructure(form);
   AutofillMetrics metrics_logger;  // ignored
   form_structure->DetermineHeuristicTypes(metrics_logger);
 
   // Build and add form structure with server data.
   std::vector<ServerFieldType> heuristic_types, server_types;
   for (size_t i = 0; i < form.fields.size(); ++i) {
     heuristic_types.push_back(UNKNOWN_TYPE);
-    server_types.push_back(form_structure->field(i)->Type().server_type());
+    server_types.push_back(form_structure->field(i)->heuristic_type());
   }
   form_structure->SetFieldTypes(heuristic_types, server_types);
   autofill_manager_->AddSeenForm(form_structure);
 
   autofill_manager_->OnMaybeShowAutocheckoutBubble(form, gfx::RectF());
 
   EXPECT_TRUE(delegate.autocheckout_bubble_shown());
 }
 
 // Test that Autocheckout bubble is not offered when server doesn't have data
 // for the form.
 TEST_F(AutofillManagerTest, TestAutocheckoutBubbleNotShown) {
   MockAutofillManagerDelegate delegate;
   autofill_manager_.reset(new TestAutofillManager(
       autofill_driver_.get(), &delegate, &personal_data_));
   autofill_manager_->set_autofill_enabled(true);
   autofill_manager_->MarkAsFirstPageInAutocheckoutFlow();
 
   FormData form;
   test::CreateTestAddressFormData(&form);
 
   TestFormStructure* form_structure = new TestFormStructure(form);
   AutofillMetrics metrics_logger;  // ignored
   form_structure->DetermineHeuristicTypes(metrics_logger);
 
   // Build form structure without server data.
   std::vector<ServerFieldType> heuristic_types, server_types;
   for (size_t i = 0; i < form.fields.size(); ++i) {
-    heuristic_types.push_back(form_structure->field(i)->Type().server_type());
+    heuristic_types.push_back(form_structure->field(i)->heuristic_type());
     server_types.push_back(NO_SERVER_DATA);
   }
   form_structure->SetFieldTypes(heuristic_types, server_types);
   autofill_manager_->AddSeenForm(form_structure);
 
   autofill_manager_->OnMaybeShowAutocheckoutBubble(form, gfx::RectF());
 
   EXPECT_FALSE(delegate.autocheckout_bubble_shown());
 }
 
@@ skipping 24 matching lines @@
   autofill_manager_->set_autocheckout_url_prefix("test-prefix");
   // Push address only
   std::vector<FormData> forms;
   forms.push_back(address);
 
   // Build and add form structure with server data.
   scoped_ptr<TestFormStructure> form_structure(new TestFormStructure(address));
   std::vector<ServerFieldType> heuristic_types, server_types;
   for (size_t i = 0; i < address.fields.size(); ++i) {
     heuristic_types.push_back(UNKNOWN_TYPE);
-    server_types.push_back(form_structure->field(i)->Type().server_type());
+    server_types.push_back(form_structure->field(i)->heuristic_type());
   }
   form_structure->SetFieldTypes(heuristic_types, server_types);
   autofill_manager_->AddSeenForm(form_structure.release());
 
   // Make sure normal form is handled correctly.
   autofill_manager_->MarkAsFirstPageInAutocheckoutFlowIgnoringAjax();
   std::vector<FormStructure*> form_structures;
   form_structures = autofill_manager_->GetFormStructures();
   ASSERT_EQ(1U, form_structures.size());
   EXPECT_EQ("/form.html", form_structures[0]->source_url().path());
 
   scoped_ptr<FormStructure> filled_form(new TestFormStructure(address));
   delegate.SetUserSuppliedData(filled_form.Pass());
   autofill_manager_->OnMaybeShowAutocheckoutBubble(address, gfx::RectF());
 
   // Push other forms
   forms.push_back(shipping_options);
   forms.push_back(user_supplied);
 
   // FormStructure should contain the same forms as before.
   DynamicFormsSeen(forms);
   form_structures = autofill_manager_->GetFormStructures();
   ASSERT_EQ(1U, form_structures.size());
   EXPECT_EQ("/form.html", form_structures[0]->source_url().path());
 }
 
 }  // namespace autofill