Move forms/ out of webkit/.

content/public/renderer/document_state.h

 // 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.
 
 #ifndef CONTENT_PUBLIC_RENDERER_DOCUMENT_STATE_H_
 #define CONTENT_PUBLIC_RENDERER_DOCUMENT_STATE_H_
 
 #include <string>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebReferrerPolicy.h"
 #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;
 }
 
 namespace content {
 
 class NavigationState;
+struct PasswordForm;
 
 // The RenderView stores an instance of this class in the "extra data" of each
 // WebDataSource (see RenderView::DidCreateDataSource).
 class DocumentState : public WebKit::WebDataSource::ExtraData {
  public:
   // The exact values of this enum are used in histograms, so new values must be
   // added to the end.
   enum LoadType {
     UNDEFINED_LOAD,            // Not yet initialized.
     RELOAD,                    // User pressed reload.
@@ skipping 127 matching lines @@
 
   const GURL& searchable_form_url() const { return searchable_form_url_; }
   void set_searchable_form_url(const GURL& url) { searchable_form_url_ = url; }
   const std::string& searchable_form_encoding() const {
     return searchable_form_encoding_;
   }
   void set_searchable_form_encoding(const std::string& encoding) {
     searchable_form_encoding_ = encoding;
   }
 
-  webkit::forms::PasswordForm* password_form_data() const {
+  content::PasswordForm* password_form_data() const {
     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) {
     security_info_ = security_info;
   }
 
   // True if an error page should be used, if the http status code also
   // indicates an error.
   bool use_error_page() const { return use_error_page_; }
   void set_use_error_page(bool use_error_page) {
@@ skipping 84 matching lines @@
   bool web_timing_histograms_recorded_;
   int http_status_code_;
   bool was_fetched_via_spdy_;
   bool was_npn_negotiated_;
   std::string npn_negotiated_protocol_;
   bool was_alternate_protocol_available_;
   bool was_fetched_via_proxy_;
 
   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_;
 
   bool is_overriding_user_agent_;
   bool must_reset_scroll_and_scale_state_;
 
   // A prefetcher is a page that contains link rel=prefetch elements.
   bool was_prefetcher_;
   bool was_referred_by_prefetcher_;
 
   LoadType load_type_;
 
   bool cache_policy_override_set_;
   WebKit::WebURLRequest::CachePolicy cache_policy_override_;
 
   bool referrer_policy_set_;
   WebKit::WebReferrerPolicy referrer_policy_;
 
   scoped_ptr<webkit_glue::AltErrorPageResourceFetcher> alt_error_page_fetcher_;
 
   scoped_ptr<NavigationState> navigation_state_;
 };
 
 #endif  // CONTENT_PUBLIC_RENDERER_DOCUMENT_STATE_H_
 
 }  // namespace content