Move forms/ out of webkit/.

chrome/renderer/autofill/autofill_agent.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 CHROME_RENDERER_AUTOFILL_AUTOFILL_AGENT_H_
 #define CHROME_RENDERER_AUTOFILL_AUTOFILL_AGENT_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/renderer/autofill/form_cache.h"
 #include "chrome/renderer/page_click_listener.h"
 #include "content/public/renderer/render_view_observer.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebAutofillClient.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputElement.h"
 
-namespace webkit {
-namespace forms {
-struct FormData;
-struct FormDataPredictions;
-struct FormField;
-}
-}
+struct FormFieldData;
 
 namespace WebKit {
 class WebNode;
 }
 
 namespace autofill {
 
 class PasswordAutofillManager;
 
 // AutofillAgent deals with Autofill related communications between WebKit and
@@ skipping 56 matching lines @@
       const WebKit::WebInputElement& element) OVERRIDE;
   virtual void textFieldDidReceiveKeyDown(
       const WebKit::WebInputElement& element,
       const WebKit::WebKeyboardEvent& event) OVERRIDE;
 
   void OnSuggestionsReturned(int query_id,
                              const std::vector<string16>& values,
                              const std::vector<string16>& labels,
                              const std::vector<string16>& icons,
                              const std::vector<int>& unique_ids);
-  void OnFormDataFilled(int query_id, const webkit::forms::FormData& form);
+  void OnFormDataFilled(int query_id, const FormData& form);
   void OnFieldTypePredictionsAvailable(
-      const std::vector<webkit::forms::FormDataPredictions>& forms);
+      const std::vector<FormDataPredictions>& forms);
 
   // For external Autofill selection.
   void OnSelectAutofillSuggestionAtIndex(int listIndex);
   void OnSetAutofillActionFill();
   void OnClearForm();
   void OnSetAutofillActionPreview();
   void OnClearPreviewedForm();
   void OnSetNodeText(const string16& value);
   void OnAcceptDataListSuggestion(const string16& value);
   void OnAcceptPasswordAutofillSuggestion(const string16& value);
@@ skipping 40 matching lines @@
   // profile's unique ID.  |action| specifies whether to Fill or Preview the
   // values returned from the AutofillManager.
   void FillAutofillFormData(const WebKit::WebNode& node,
                             int unique_id,
                             AutofillAction action);
 
   // Fills |form| and |field| with the FormData and FormField corresponding to
   // |node|. Returns true if the data was found; and false otherwise.
   bool FindFormAndFieldForNode(
       const WebKit::WebNode& node,
-      webkit::forms::FormData* form,
-      webkit::forms::FormField* field) WARN_UNUSED_RESULT;
+      FormData* form,
+      FormFieldData* field) WARN_UNUSED_RESULT;
 
   // Set |node| to display the given |value|.
   void SetNodeText(const string16& value, WebKit::WebInputElement* node);
 
   FormCache form_cache_;
 
   PasswordAutofillManager* password_autofill_manager_;  // WEAK reference.
 
   // The ID of the last request sent for form field Autofill.  Used to ignore
   // out of date responses.
@@ skipping 26 matching lines @@
   FRIEND_TEST_ALL_PREFIXES(PasswordAutofillManagerTest, WaitUsername);
   FRIEND_TEST_ALL_PREFIXES(PasswordAutofillManagerTest, SuggestionAccept);
   FRIEND_TEST_ALL_PREFIXES(PasswordAutofillManagerTest, SuggestionSelect);
 
   DISALLOW_COPY_AND_ASSIGN(AutofillAgent);
 };
 
 }  // namespace autofill
 
 #endif  // CHROME_RENDERER_AUTOFILL_AUTOFILL_AGENT_H_