Group forms-related files in webkit/glue in a forms/ subdirectory.

chrome/browser/importer/importer_unittest.cc

 // Copyright (c) 2011 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 "build/build_config.h"
 
 #if defined(OS_WIN)
 // The order of these includes is important.
 #include <windows.h>
 #include <unknwn.h>
@@ skipping 18 matching lines @@
 #include "chrome/browser/history/history_types.h"
 #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/search_engines/template_url.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "webkit/glue/password_form.h"
+#include "webkit/forms/password_form.h"
 
 #if defined(OS_WIN)
 #include "base/win/scoped_comptr.h"
 #include "base/win/windows_version.h"
 #include "chrome/browser/importer/ie_importer.h"
 #include "chrome/browser/password_manager/ie7_password.h"
 #endif
 
 // TODO(estade): some of these are disabled on mac. http://crbug.com/48007
 #if defined(OS_MACOSX)
@@ skipping 163 matching lines @@
 
   virtual bool BookmarkModelIsLoaded() const {
     // Profile is ready for writing.
     return true;
   }
 
   virtual bool TemplateURLServiceIsLoaded() const {
     return true;
   }
 
-  virtual void AddPasswordForm(const webkit_glue::PasswordForm& form) {
+  virtual void AddPasswordForm(const webkit::forms::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 315 matching lines @@
 
   virtual bool BookmarkModelIsLoaded() const {
     // Profile is ready for writing.
     return true;
   }
 
   virtual bool TemplateURLServiceIsLoaded() const {
     return true;
   }
 
-  virtual void AddPasswordForm(const webkit_glue::PasswordForm& form) {
+  virtual void AddPasswordForm(const webkit::forms::PasswordForm& form) {
     PasswordList p = kFirefox2Passwords[password_count_];
     EXPECT_EQ(p.origin, form.origin.spec());
     EXPECT_EQ(p.realm, form.signon_realm);
     EXPECT_EQ(p.action, form.action.spec());
     EXPECT_EQ(WideToUTF16(p.username_element), form.username_element);
     EXPECT_EQ(WideToUTF16(p.username), form.username_value);
     EXPECT_EQ(WideToUTF16(p.password_element), form.password_element);
     EXPECT_EQ(WideToUTF16(p.password), form.password_value);
     EXPECT_EQ(p.blacklisted, form.blacklisted_by_user);
     ++password_count_;
@@ skipping 183 matching lines @@
 
   virtual bool BookmarkModelIsLoaded() const {
     // Profile is ready for writing.
     return true;
   }
 
   virtual bool TemplateURLServiceIsLoaded() const {
     return true;
   }
 
-  virtual void AddPasswordForm(const webkit_glue::PasswordForm& form) {
+  virtual void AddPasswordForm(const webkit::forms::PasswordForm& form) {
     PasswordList p = kFirefox3Passwords[password_count_];
     EXPECT_EQ(p.origin, form.origin.spec());
     EXPECT_EQ(p.realm, form.signon_realm);
     EXPECT_EQ(p.action, form.action.spec());
     EXPECT_EQ(WideToUTF16(p.username_element), form.username_element);
     EXPECT_EQ(WideToUTF16(p.username), form.username_value);
     EXPECT_EQ(WideToUTF16(p.password_element), form.password_element);
     EXPECT_EQ(WideToUTF16(p.password), form.password_value);
     EXPECT_EQ(p.blacklisted, form.blacklisted_by_user);
     ++password_count_;
@@ skipping 73 matching lines @@
                         true);
 }
 
 TEST_F(ImporterTest, MAYBE(Firefox35Importer)) {
   bool import_search_engines = false;
   scoped_refptr<Firefox3Observer> observer(
       new Firefox3Observer(import_search_engines));
   Firefox3xImporterTest("firefox35_profile", observer.get(), observer.get(),
                         import_search_engines);
 }