Move forms/ out of webkit/.

content/public/renderer/document_state.h

Index: content/public/renderer/document_state.h
diff --git a/content/public/renderer/document_state.h b/content/public/renderer/document_state.h
index b9adb22d0eaa3cd3210fba601c9c60204e2014d3..fb18f1db8dd0d523c8aa67e1988ea2a39b4bfbd2 100644
--- a/content/public/renderer/document_state.h
+++ b/content/public/renderer/document_state.h
@@ -14,12 +14,6 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDataSource.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLRequest.h"
 
-namespace webkit {
-namespace forms {
-struct PasswordForm;
-}
-}
-
 namespace webkit_glue {
 class AltErrorPageResourceFetcher;
 }
@@ -27,6 +21,7 @@ class AltErrorPageResourceFetcher;
 namespace content {
 
 class NavigationState;
+struct PasswordForm;
 
 // The RenderView stores an instance of this class in the "extra data" of each
 // WebDataSource (see RenderView::DidCreateDataSource).
@@ -174,10 +169,10 @@ class DocumentState : public WebKit::WebDataSource::ExtraData {
     searchable_form_encoding_ = encoding;
   }
 
-  webkit::forms::PasswordForm* password_form_data() const {
+  content::PasswordForm* password_form_data() const {

[jam, 2012/10/03 16:43:49]

nit: get rid of content:: here and below

[blundell, 2012/10/03 21:17:55]

Done.

     return password_form_data_.get();
   }
-  void set_password_form_data(scoped_ptr<webkit::forms::PasswordForm> data);
+  void set_password_form_data(scoped_ptr<content::PasswordForm> data);
 
   const std::string& security_info() const { return security_info_; }
   void set_security_info(const std::string& security_info) {
@@ -282,7 +277,7 @@ class DocumentState : public WebKit::WebDataSource::ExtraData {
 
   GURL searchable_form_url_;
   std::string searchable_form_encoding_;
-  scoped_ptr<webkit::forms::PasswordForm> password_form_data_;
+  scoped_ptr<content::PasswordForm> password_form_data_;
   std::string security_info_;
 
   bool use_error_page_;