Move SearchableFormData over to the WebKit API.

chrome/renderer/navigation_state.h

 // Copyright (c) 2009 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 CHROME_RENDERER_NAVIGATION_STATE_H_
 #define CHROME_RENDERER_NAVIGATION_STATE_H_
 
 #include "base/scoped_ptr.h"
 #include "base/time.h"
 #include "chrome/common/page_transition_types.h"
 #include "webkit/api/public/WebDataSource.h"
 #include "webkit/glue/alt_error_page_resource_fetcher.h"
 #include "webkit/glue/password_form.h"
-#include "webkit/glue/searchable_form_data.h"
 
 // The RenderView stores an instance of this class in the "extra data" of each
 // WebDataSource (see RenderView::DidCreateDataSource).
 class NavigationState : public WebKit::WebDataSource::ExtraData {
  public:
   static NavigationState* CreateBrowserInitiated(
       int32 pending_page_id,
       PageTransition::Type transition_type,
       base::Time request_time) {
     return new NavigationState(transition_type, request_time, false,
@@ skipping 84 matching lines @@
   }
 
   // True if we have already processed the "DidCommitLoad" event for this
   // request.  Used by session history.
   bool request_committed() const { return request_committed_; }
   void set_request_committed(bool value) { request_committed_ = value; }
 
   // True if this navigation was not initiated via WebFrame::LoadRequest.
   bool is_content_initiated() const { return is_content_initiated_; }
 
-  webkit_glue::SearchableFormData* searchable_form_data() const {
-    return searchable_form_data_.get();
+  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_data(webkit_glue::SearchableFormData* data) {
-    searchable_form_data_.reset(data);
+  void set_searchable_form_encoding(const std::string& encoding) {
+    searchable_form_encoding_ = encoding;
   }
 
   webkit_glue::PasswordForm* password_form_data() const {
     return password_form_data_.get();
   }
   void set_password_form_data(webkit_glue::PasswordForm* data) {
     password_form_data_.reset(data);
   }
 
   webkit_glue::AltErrorPageResourceFetcher* alt_error_page_fetcher() const {
@@ skipping 46 matching lines @@
   base::Time start_load_time_;
   base::Time commit_load_time_;
   base::Time finish_document_load_time_;
   base::Time finish_load_time_;
   base::Time first_paint_time_;
   base::Time first_paint_after_load_time_;
   bool load_histograms_recorded_;
   bool request_committed_;
   bool is_content_initiated_;
   int32 pending_page_id_;
-  scoped_ptr<webkit_glue::SearchableFormData> searchable_form_data_;
+  GURL searchable_form_url_;
+  std::string searchable_form_encoding_;
   scoped_ptr<webkit_glue::PasswordForm> password_form_data_;
   scoped_ptr<webkit_glue::AltErrorPageResourceFetcher> alt_error_page_fetcher_;
   std::string security_info_;
   bool postpone_loading_data_;
   std::string postponed_data_;
 
   DISALLOW_COPY_AND_ASSIGN(NavigationState);
 };
 
 #endif  // CHROME_RENDERER_NAVIGATION_STATE_H_