Move forms/ out of webkit/.

chrome/browser/autofill/autofill_merge_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/basictypes.h"
 #include "base/file_path.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autofill/autofill_common_test.h"
 #include "chrome/browser/autofill/autofill_type.h"
 #include "chrome/browser/autofill/data_driven_test.h"
 #include "chrome/browser/autofill/form_structure.h"
 #include "chrome/browser/autofill/personal_data_manager.h"
+#include "chrome/common/form_data.h"
 #include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputElement.h"
-#include "webkit/forms/form_data.h"
 
 namespace {
 
 const FilePath::CharType kTestName[] = FILE_PATH_LITERAL("merge");
 const FilePath::CharType kFileNamePattern[] = FILE_PATH_LITERAL("*.in");
 
 const char kFieldSeparator[] = ": ";
 const char kProfileSeparator[] = "---";
 const size_t kFieldOffset = arraysize(kFieldSeparator) - 1;
 
@@ skipping 118 matching lines @@
                                         std::string* output) {
   MergeProfiles(input, output);
 }
 
 void AutofillMergeTest::MergeProfiles(const std::string& profiles,
                                       std::string* merged_profiles) {
   // Start with no saved profiles.
   personal_data_.Reset();
 
   // Create a test form.
-  webkit::forms::FormData form;
+  FormData form;
   form.name = ASCIIToUTF16("MyTestForm");
   form.method = ASCIIToUTF16("POST");
   form.origin = GURL("https://www.example.com/origin.html");
   form.action = GURL("https://www.example.com/action.html");
   form.user_submitted = true;
 
   // Parse the input line by line.
   std::vector<std::string> lines;
   Tokenize(profiles, "\n", &lines);
   for (size_t i = 0; i < lines.size(); ++i) {
     std::string line = lines[i];
 
     if (line != kProfileSeparator) {
       // Add a field to the current profile.
       size_t separator_pos = line.find(kFieldSeparator);
       ASSERT_NE(std::string::npos, separator_pos);
       string16 field_type = UTF8ToUTF16(line.substr(0, separator_pos));
       string16 value = UTF8ToUTF16(line.substr(separator_pos + kFieldOffset));
 
-      webkit::forms::FormField field;
+      FormFieldData field;
       field.label = field_type;
       field.name = field_type;
       field.value = value;
       field.form_control_type = ASCIIToUTF16("text");
       form.fields.push_back(field);
     }
 
     // The first line is always a profile separator, and the last profile is not
     // followed by an explicit separator.
     if ((i > 0 && line == kProfileSeparator) || i == lines.size() - 1) {
@@ skipping 19 matching lines @@
     }
   }
 
   *merged_profiles = SerializeProfiles(personal_data_.web_profiles());
 }
 
 TEST_F(AutofillMergeTest, DataDrivenMergeProfiles) {
   RunDataDrivenTest(GetInputDirectory(kTestName), GetOutputDirectory(kTestName),
                     kFileNamePattern);
 }