Move forms/ out of webkit/.

chrome/browser/autofill/form_structure_unittest.cc

 // Copyright (c) 2011 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/memory/scoped_ptr.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autofill/form_structure.h"
+#include "content/public/common/form_data.h"
+#include "content/public/common/form_field.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"
-#include "webkit/forms/form_field.h"
 
-using webkit::forms::FormData;
-using webkit::forms::FormField;
+using content::FormData;
+using content::FormField;
 using WebKit::WebInputElement;
 
-namespace webkit {
-namespace forms {
+namespace content {
 
 std::ostream& operator<<(std::ostream& os, const FormData& form) {
   os << UTF16ToUTF8(form.name)
      << " "
      << UTF16ToUTF8(form.method)
      << " "
      << form.origin.spec()
      << " "
      << form.action.spec()
      << " ";
 
-  for (std::vector<webkit::forms::FormField>::const_iterator iter =
+  for (std::vector<content::FormField>::const_iterator iter =

[stuartmorgan, 2012/10/02 12:17:51]

Since we have a using directive, and this is in the content namespace anyway, we
shouldn't need the content:: here.

[blundell, 2012/10/03 15:06:07]

Done.

            form.fields.begin();
        iter != form.fields.end(); ++iter) {
     os << *iter
        << " ";
   }
 
   return os;
 }
 
-}  // namespace forms
-}  // namespace webkit_glue
+}  // namespace content
 
 class FormStructureTest {
  public:
   static std::string Hash64Bit(const std::string& str) {
     return FormStructure::Hash64Bit(str);
   }
 };
 
 TEST(FormStructureTest, FieldCount) {
   FormData form;
@@ skipping 1933 matching lines @@
   EXPECT_EQ(FormStructureTest::Hash64Bit(
       std::string("https://login.facebook.com&&email&first")),
       form_structure->FormSignature());
 
   form.name = ASCIIToUTF16("login_form");
   form_structure.reset(new FormStructure(form));
   EXPECT_EQ(FormStructureTest::Hash64Bit(
       std::string("https://login.facebook.com&login_form&email&first")),
       form_structure->FormSignature());
 }