Move forms/ out of webkit/.

chrome/browser/importer/ie_importer_unittest_win.cc

 // 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.
 
 #include "testing/gtest/include/gtest/gtest.h"
 
 // The order of these includes is important.
 #include <windows.h>
 #include <unknwn.h>
 #include <intshcut.h>
@@ skipping 21 matching lines @@
 #include "chrome/browser/importer/importer_bridge.h"
 #include "chrome/browser/importer/importer_data_types.h"
 #include "chrome/browser/importer/importer_host.h"
 #include "chrome/browser/importer/importer_progress_observer.h"
 #include "chrome/browser/importer/importer_unittest_utils.h"
 #include "chrome/browser/importer/ie_importer.h"
 #include "chrome/browser/password_manager/ie7_password.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/test/base/testing_profile.h"
-#include "webkit/forms/password_form.h"
+#include "content/public/common/password_form.h"
 
 namespace {
 
 const char16 kUnitTestRegistrySubKey[] = L"SOFTWARE\\Chromium Unit Tests";
 const char16 kUnitTestUserOverrideSubKey[] =
     L"SOFTWARE\\Chromium Unit Tests\\HKCU Override";
 
 const BookmarkInfo kIEBookmarks[] = {
   {true, 2, {L"Links", L"SubFolderOfLinks"},
    L"SubLink",
@@ skipping 220 matching lines @@
 
   virtual bool BookmarkModelIsLoaded() const {
     // Profile is ready for writing.
     return true;
   }
 
   virtual bool TemplateURLServiceIsLoaded() const {
     return true;
   }
 
-  virtual void AddPasswordForm(const webkit::forms::PasswordForm& form) {
+  virtual void AddPasswordForm(const content::PasswordForm& form) {
     // Importer should obtain this password form only.
     EXPECT_EQ(GURL("http://localhost:8080/security/index.htm"), form.origin);
     EXPECT_EQ("http://localhost:8080/", form.signon_realm);
     EXPECT_EQ(L"user", form.username_element);
     EXPECT_EQ(L"1", form.username_value);
     EXPECT_EQ(L"", form.password_element);
     EXPECT_EQ(L"2", form.password_value);
     EXPECT_EQ("", form.action.spec());
     ++password_count_;
   }
@@ skipping 76 matching lines @@
   virtual void ImportItemStarted(importer::ImportItem item) OVERRIDE {}
   virtual void ImportItemEnded(importer::ImportItem item) OVERRIDE {}
   virtual void ImportEnded() OVERRIDE {
     MessageLoop::current()->Quit();
     EXPECT_EQ(arraysize(kIESortedBookmarks), bookmark_count_);
   }
 
   virtual bool BookmarkModelIsLoaded() const { return true; }
   virtual bool TemplateURLServiceIsLoaded() const { return true; }
 
-  virtual void AddPasswordForm(const webkit::forms::PasswordForm& form) {}
+  virtual void AddPasswordForm(const content::PasswordForm& form) {}
   virtual void AddHistoryPage(const history::URLRows& page,
                               history::VisitSource visit_source) {}
   virtual void AddKeyword(std::vector<TemplateURL*> template_url,
                           int default_keyword_index) {}
   virtual void AddBookmarks(const std::vector<BookmarkEntry>& bookmarks,
                             const string16& top_level_folder_name) OVERRIDE {
     ASSERT_LE(bookmark_count_ + bookmarks.size(),
               arraysize(kIESortedBookmarks));
     for (size_t i = 0; i < bookmarks.size(); ++i) {
       EXPECT_TRUE(EqualBookmarkEntry(bookmarks[i],
@@ skipping 246 matching lines @@
   ASSERT_TRUE(ie7_password::GetUserPassFromData(decrypted_data1, &username,
                                                 &password));
   EXPECT_EQ(L"abcdefgh", username);
   EXPECT_EQ(L"abcdefghijkl", password);
 
   ASSERT_TRUE(ie7_password::GetUserPassFromData(decrypted_data2, &username,
                                                 &password));
   EXPECT_EQ(L"abcdefghi", username);
   EXPECT_EQ(L"abcdefg", password);
 }