Move forms/ out of webkit/.

chrome/browser/autofill/autofill_metrics_unittest.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 <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/string16.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/api/infobars/infobar_service.h"
 #include "chrome/browser/autofill/autofill_cc_infobar_delegate.h"
 #include "chrome/browser/autofill/autofill_common_test.h"
 #include "chrome/browser/autofill/autofill_manager.h"
 #include "chrome/browser/autofill/autofill_manager_delegate.h"
 #include "chrome/browser/autofill/autofill_metrics.h"
 #include "chrome/browser/autofill/personal_data_manager.h"
 #include "chrome/browser/autofill/personal_data_manager_factory.h"
 #include "chrome/browser/ui/autofill/tab_autofill_manager_delegate.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/tab_contents/test_tab_contents.h"
 #include "chrome/browser/webdata/web_data_service.h"
+#include "chrome/common/form_data.h"
+#include "chrome/common/form_field_data.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/test/test_browser_thread.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/rect.h"
-#include "webkit/forms/form_data.h"
-#include "webkit/forms/form_field.h"
 
 using content::BrowserThread;
 using ::testing::_;
 using ::testing::AnyNumber;
 using ::testing::Mock;
 using base::TimeTicks;
 using base::TimeDelta;
-using webkit::forms::FormData;
-using webkit::forms::FormField;
 
 namespace {
 
 class MockAutofillMetrics : public AutofillMetrics {
  public:
   MockAutofillMetrics() {}
   MOCK_CONST_METHOD1(LogCreditCardInfoBarMetric, void(InfoBarMetric metric));
   MOCK_CONST_METHOD3(LogHeuristicTypePrediction,
                      void(FieldTypeQualityMetric metric,
                           AutofillFieldType field_type,
@@ skipping 283 matching lines @@
 TEST_F(AutofillMetricsTest, QualityMetrics) {
   // Set up our form data.
   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;
 
   std::vector<AutofillFieldType> heuristic_types, server_types;
-  FormField field;
+  FormFieldData field;
 
   autofill_test::CreateTestFormField(
       "Autofilled", "autofilled", "Elvis Aaron Presley", "text", &field);
   field.is_autofilled = true;
   form.fields.push_back(field);
   heuristic_types.push_back(NAME_FULL);
   server_types.push_back(NAME_FIRST);
 
   autofill_test::CreateTestFormField(
       "Autofill Failed", "autofillfailed", "buddy@gmail.com", "text", &field);
@@ skipping 194 matching lines @@
     {
       "Heuristics mismatch, server mismatch", "2,2", "38116",
       PHONE_HOME_NUMBER, PHONE_HOME_NUMBER,
       AutofillMetrics::NOT_AUTOFILLED_HEURISTIC_TYPE_MISMATCH,
       AutofillMetrics::NOT_AUTOFILLED_SERVER_TYPE_MISMATCH
     }
   };
 
   std::vector<AutofillFieldType> heuristic_types, server_types;
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(failure_cases); ++i) {
-    FormField field;
+    FormFieldData field;
     autofill_test::CreateTestFormField(failure_cases[i].label,
                                        failure_cases[i].name,
                                        failure_cases[i].value, "text", &field);
     form.fields.push_back(field);
     heuristic_types.push_back(failure_cases[i].heuristic_type);
     server_types.push_back(failure_cases[i].server_type);
 
   }
 
   // Simulate having seen this form with the desired heuristic and server types.
@@ skipping 33 matching lines @@
   // Set up our form data.
   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;
 
   std::vector<AutofillFieldType> heuristic_types, server_types;
 
-  FormField field;
+  FormFieldData field;
   autofill_test::CreateTestFormField(
       "Both match", "match", "Elvis Aaron Presley", "text", &field);
   field.is_autofilled = true;
   form.fields.push_back(field);
   heuristic_types.push_back(NAME_FULL);
   server_types.push_back(NAME_FULL);
   autofill_test::CreateTestFormField(
       "Both mismatch", "mismatch", "buddy@gmail.com", "text", &field);
   field.is_autofilled = false;
   form.fields.push_back(field);
@@ skipping 12 matching lines @@
   heuristic_types.push_back(UNKNOWN_TYPE);
   server_types.push_back(UNKNOWN_TYPE);
 
   // Simulate having seen this form with the desired heuristic and server types.
   // |form_structure| will be owned by |autofill_manager_|.
   autofill_manager_->AddSeenForm(form, heuristic_types, server_types,
                                  std::string());
 
 
   // Add a field and re-arrange the remaining form fields before submitting.
-  std::vector<FormField> cached_fields = form.fields;
+  std::vector<FormFieldData> cached_fields = form.fields;
   form.fields.clear();
   autofill_test::CreateTestFormField(
       "New field", "new field", "Tennessee", "text", &field);
   form.fields.push_back(field);
   form.fields.push_back(cached_fields[2]);
   form.fields.push_back(cached_fields[1]);
   form.fields.push_back(cached_fields[3]);
   form.fields.push_back(cached_fields[0]);
 
   // Establish our expectations.
@@ skipping 101 matching lines @@
 // Test that we don't log quality metrics for non-autofillable forms.
 TEST_F(AutofillMetricsTest, NoQualityMetricsForNonAutofillableForms) {
   // Forms must include at least three fields to be auto-fillable.
   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;
 
-  FormField field;
+  FormFieldData field;
   autofill_test::CreateTestFormField(
       "Autofilled", "autofilled", "Elvis Presley", "text", &field);
   field.is_autofilled = true;
   form.fields.push_back(field);
   autofill_test::CreateTestFormField(
       "Autofill Failed", "autofillfailed", "buddy@gmail.com", "text", &field);
   form.fields.push_back(field);
 
   // Simulate form submission.
   EXPECT_CALL(*autofill_manager_->metric_logger(),
@@ skipping 20 matching lines @@
 TEST_F(AutofillMetricsTest, QualityMetricsWithExperimentId) {
   // Set up our form data.
   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;
 
   std::vector<AutofillFieldType> heuristic_types, server_types;
-  FormField field;
+  FormFieldData field;
 
   autofill_test::CreateTestFormField(
       "Autofilled", "autofilled", "Elvis Aaron Presley", "text", &field);
   field.is_autofilled = true;
   form.fields.push_back(field);
   heuristic_types.push_back(NAME_FULL);
   server_types.push_back(NAME_FIRST);
 
   autofill_test::CreateTestFormField(
       "Autofill Failed", "autofillfailed", "buddy@gmail.com", "text", &field);
@@ skipping 131 matching lines @@
 // Test that we log the number of Autofill suggestions when filling a form.
 TEST_F(AutofillMetricsTest, AddressSuggestionsCount) {
   // Set up our form data.
   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;
 
-  FormField field;
+  FormFieldData field;
   std::vector<AutofillFieldType> field_types;
   autofill_test::CreateTestFormField("Name", "name", "", "text", &field);
   form.fields.push_back(field);
   field_types.push_back(NAME_FULL);
   autofill_test::CreateTestFormField("Email", "email", "", "email", &field);
   form.fields.push_back(field);
   field_types.push_back(EMAIL_ADDRESS);
   autofill_test::CreateTestFormField("Phone", "phone", "", "tel", &field);
   form.fields.push_back(field);
   field_types.push_back(PHONE_HOME_NUMBER);
@@ skipping 153 matching lines @@
 // and form submission.
 TEST_F(AutofillMetricsTest, UserHappinessFormLoadAndSubmission) {
   // Start with a form with insufficiently many fields.
   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;
 
-  FormField field;
+  FormFieldData field;
   autofill_test::CreateTestFormField("Name", "name", "", "text", &field);
   form.fields.push_back(field);
   autofill_test::CreateTestFormField("Email", "email", "", "text", &field);
   form.fields.push_back(field);
 
   std::vector<FormData> forms(1, form);
 
   // Expect no notifications when the form is first seen.
   {
     EXPECT_CALL(*autofill_manager_->metric_logger(),
@@ skipping 113 matching lines @@
 // interaction.
 TEST_F(AutofillMetricsTest, UserHappinessFormInteraction) {
   // Load a fillable form.
   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;
 
-  FormField field;
+  FormFieldData field;
   autofill_test::CreateTestFormField("Name", "name", "", "text", &field);
   form.fields.push_back(field);
   autofill_test::CreateTestFormField("Email", "email", "", "text", &field);
   form.fields.push_back(field);
   autofill_test::CreateTestFormField("Phone", "phone", "", "text", &field);
   form.fields.push_back(field);
 
   std::vector<FormData> forms(1, form);
 
   // Expect a notification when the form is first seen.
@@ skipping 84 matching lines @@
 // Verify that we correctly log metrics tracking the duration of form fill.
 TEST_F(AutofillMetricsTest, FormFillDuration) {
   // Load a fillable form.
   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;
 
-  FormField field;
+  FormFieldData field;
   autofill_test::CreateTestFormField("Name", "name", "", "text", &field);
   form.fields.push_back(field);
   autofill_test::CreateTestFormField("Email", "email", "", "text", &field);
   form.fields.push_back(field);
   autofill_test::CreateTestFormField("Phone", "phone", "", "text", &field);
   form.fields.push_back(field);
 
   std::vector<FormData> forms(1, form);
 
   // Fill the field values for form submission.
@@ skipping 85 matching lines @@
     autofill_manager_->OnTextFieldDidChange(form, form.fields.front(),
                                             TimeTicks::FromInternalValue(3));
     autofill_manager_->FormSubmitted(form, TimeTicks::FromInternalValue(17));
     autofill_manager_->Reset();
     Mock::VerifyAndClearExpectations(autofill_manager_->metric_logger());
   }
 
   // Restore the global Gmock verbosity level to its default value.
   ::testing::FLAGS_gmock_verbose = "warning";
 }