Index: content/public/common/form_field.h |
diff --git a/webkit/forms/form_field.h b/content/public/common/form_field.h |
similarity index 84% |
rename from webkit/forms/form_field.h |
rename to content/public/common/form_field.h |
index 0e92d9872d1a5609c39a1fa1f55a4b8710ecca93..95bb72a0dc59153fb2fd4bb2e20a57cf9d765e43 100644 |
--- a/webkit/forms/form_field.h |
+++ b/content/public/common/form_field.h |
@@ -2,19 +2,18 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#ifndef WEBKIT_FORMS_FORM_FIELD_H_ |
-#define WEBKIT_FORMS_FORM_FIELD_H_ |
+#ifndef CONTENT_PUBLIC_COMMON_FORM_FIELD_H_ |
+#define CONTENT_PUBLIC_COMMON_FORM_FIELD_H_ |
#include <vector> |
#include "base/string16.h" |
-#include "webkit/forms/webkit_forms_export.h" |
+#include "content/common/content_export.h" |
-namespace webkit { |
-namespace forms { |
+namespace content { |
// Stores information about a field in a form. |
-struct WEBKIT_FORMS_EXPORT FormField { |
+struct CONTENT_EXPORT FormField { |
FormField(); |
virtual ~FormField(); |
@@ -44,11 +43,10 @@ struct WEBKIT_FORMS_EXPORT FormField { |
}; |
// So we can compare FormFields with EXPECT_EQ(). |
-WEBKIT_FORMS_EXPORT std::ostream& operator<<(std::ostream& os, |
+CONTENT_EXPORT std::ostream& operator<<(std::ostream& os, |
const FormField& field); |
-} // namespace forms |
-} // namespace webkit |
+} // namespace content |
// Prefer to use this macro in place of |EXPECT_EQ()| for comparing |FormField|s |
// in test code. |
@@ -63,4 +61,4 @@ WEBKIT_FORMS_EXPORT std::ostream& operator<<(std::ostream& os, |
EXPECT_EQ(expected.is_autofilled, actual.is_autofilled); \ |
} while (0) |
-#endif // WEBKIT_FORMS_FORM_FIELD_H_ |
+#endif // CONTENT_PUBLIC_COMMON_FORM_FIELD_H_ |