Move forms/ out of webkit/.

chrome/renderer/autofill/autofill_renderer_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/utf_string_conversions.h"
 #include "chrome/common/autofill_messages.h"
+#include "chrome/common/form_data.h"
+#include "chrome/common/form_field_data.h"
 #include "chrome/test/base/chrome_render_view_test.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputElement.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
-#include "webkit/forms/form_data.h"
-#include "webkit/forms/form_field.h"
 
 using WebKit::WebDocument;
 using WebKit::WebFrame;
 using WebKit::WebInputElement;
 using WebKit::WebString;
-using webkit::forms::FormData;
-using webkit::forms::FormField;
 
 namespace autofill {
 
 TEST_F(ChromeRenderViewTest, SendForms) {
   // Don't want any delay for form state sync changes. This will still post a
   // message so updates will get coalesced, but as soon as we spin the message
   // loop, it will generate an update.
   SendContentStateImmediately();
 
   LoadHTML("<form method=\"POST\">"
@@ skipping 11 matching lines @@
   // Verify that "FormsSeen" sends the expected number of fields.
   const IPC::Message* message = render_thread_->sink().GetFirstMessageMatching(
       AutofillHostMsg_FormsSeen::ID);
   ASSERT_NE(static_cast<IPC::Message*>(NULL), message);
   AutofillHostMsg_FormsSeen::Param params;
   AutofillHostMsg_FormsSeen::Read(message, &params);
   const std::vector<FormData>& forms = params.a;
   ASSERT_EQ(1UL, forms.size());
   ASSERT_EQ(4UL, forms[0].fields.size());
 
-  FormField expected;
+  FormFieldData expected;
 
   expected.name = ASCIIToUTF16("firstname");
   expected.value = string16();
   expected.form_control_type = ASCIIToUTF16("text");
   expected.max_length = WebInputElement::defaultMaxLength();
-  EXPECT_FORM_FIELD_EQUALS(expected, forms[0].fields[0]);
+  EXPECT_FORM_FIELD_DATA_EQUALS(expected, forms[0].fields[0]);
 
   expected.name = ASCIIToUTF16("middlename");
   expected.value = string16();
   expected.form_control_type = ASCIIToUTF16("text");
   expected.max_length = WebInputElement::defaultMaxLength();
-  EXPECT_FORM_FIELD_EQUALS(expected, forms[0].fields[1]);
+  EXPECT_FORM_FIELD_DATA_EQUALS(expected, forms[0].fields[1]);
 
   expected.name = ASCIIToUTF16("lastname");
   expected.value = string16();
   expected.form_control_type = ASCIIToUTF16("text");
   expected.max_length = WebInputElement::defaultMaxLength();
-  EXPECT_FORM_FIELD_EQUALS(expected, forms[0].fields[2]);
+  EXPECT_FORM_FIELD_DATA_EQUALS(expected, forms[0].fields[2]);
 
   expected.name = ASCIIToUTF16("state");
   expected.value = ASCIIToUTF16("?");
   expected.form_control_type = ASCIIToUTF16("select-one");
   expected.max_length = 0;
-  EXPECT_FORM_FIELD_EQUALS(expected, forms[0].fields[3]);
+  EXPECT_FORM_FIELD_DATA_EQUALS(expected, forms[0].fields[3]);
 
   // Verify that |didAcceptAutofillSuggestion()| sends the expected number of
   // fields.
   WebFrame* web_frame = GetMainFrame();
   WebDocument document = web_frame->document();
   WebInputElement firstname =
       document.getElementById("firstname").to<WebInputElement>();
 
   // Make sure to query for Autofill suggestions before selecting one.
   autofill_agent_->element_ = firstname;
@@ skipping 16 matching lines @@
   ASSERT_NE(static_cast<IPC::Message*>(NULL), message2);
   AutofillHostMsg_FillAutofillFormData::Param params2;
   AutofillHostMsg_FillAutofillFormData::Read(message2, &params2);
   const FormData& form2 = params2.b;
   ASSERT_EQ(3UL, form2.fields.size());
 
   expected.name = ASCIIToUTF16("firstname");
   expected.value = string16();
   expected.form_control_type = ASCIIToUTF16("text");
   expected.max_length = WebInputElement::defaultMaxLength();
-  EXPECT_FORM_FIELD_EQUALS(expected, form2.fields[0]);
+  EXPECT_FORM_FIELD_DATA_EQUALS(expected, form2.fields[0]);
 
   expected.name = ASCIIToUTF16("middlename");
   expected.value = string16();
   expected.form_control_type = ASCIIToUTF16("text");
   expected.max_length = WebInputElement::defaultMaxLength();
-  EXPECT_FORM_FIELD_EQUALS(expected, form2.fields[1]);
+  EXPECT_FORM_FIELD_DATA_EQUALS(expected, form2.fields[1]);
 
   expected.name = ASCIIToUTF16("state");
   expected.value = ASCIIToUTF16("?");
   expected.form_control_type = ASCIIToUTF16("select-one");
   expected.max_length = 0;
-  EXPECT_FORM_FIELD_EQUALS(expected, form2.fields[2]);
+  EXPECT_FORM_FIELD_DATA_EQUALS(expected, form2.fields[2]);
 }
 
 TEST_F(ChromeRenderViewTest, FillFormElement) {
   // Don't want any delay for form state sync changes. This will still post a
   // message so updates will get coalesced, but as soon as we spin the message
   // loop, it will generate an update.
   SendContentStateImmediately();
 
   LoadHTML("<form method=\"POST\">"
            "  <input type=\"text\" id=\"firstname\"/>"
@@ skipping 31 matching lines @@
   const IPC::Message* message2 =
       render_thread_->sink().GetUniqueMessageMatching(
           AutofillHostMsg_FillAutofillFormData::ID);
 
   // No message should be sent in this case.  |firstname| is filled directly.
   ASSERT_EQ(static_cast<IPC::Message*>(NULL), message2);
   EXPECT_EQ(firstname.value(), WebKit::WebString::fromUTF8("David"));
 }
 
 }  // namespace autofill