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

chrome/browser/importer/ie_importer.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 "chrome/browser/importer/ie_importer.h"
 
 #include <ole2.h>
 #include <intshcut.h>
 #include <pstore.h>
 #include <shlobj.h>
 #include <urlhist.h>
 
 #include <algorithm>
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/file_path.h"
 #include "base/file_util.h"
+#include "base/string16.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
-#include "base/string16.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/registry.h"
 #include "base/win/scoped_co_mem.h"
 #include "base/win/scoped_com_initializer.h"
 #include "base/win/scoped_comptr.h"
 #include "base/win/scoped_handle.h"
 #include "base/win/windows_version.h"
 #include "chrome/browser/importer/importer_bridge.h"
 #include "chrome/browser/importer/importer_data_types.h"
 #include "chrome/browser/password_manager/ie7_password.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_prepopulate_data.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/common/time_format.h"
 #include "chrome/common/url_constants.h"
 #include "googleurl/src/gurl.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "webkit/glue/password_form.h"
+#include "webkit/forms/password_form.h"
 
 namespace {
 
 // A struct that hosts the information of AutoComplete data in PStore.
 struct AutoCompleteInfo {
   string16 key;
   std::vector<string16> data;
   bool is_url;
 };
 
@@ skipping 220 matching lines @@
   for (i = 0; i < ac_list.size(); i++) {
     if (!ac_list[i].is_url || ac_list[i].data.size() < 2)
       continue;
 
     GURL url(ac_list[i].key.c_str());
     if (!(LowerCaseEqualsASCII(url.scheme(), chrome::kHttpScheme) ||
         LowerCaseEqualsASCII(url.scheme(), chrome::kHttpsScheme))) {
       continue;
     }
 
-    webkit_glue::PasswordForm form;
+    webkit::forms::PasswordForm form;
     GURL::Replacements rp;
     rp.ClearUsername();
     rp.ClearPassword();
     rp.ClearQuery();
     rp.ClearRef();
     form.origin = url.ReplaceComponents(rp);
     form.username_value = ac_list[i].data[0];
     form.password_value = ac_list[i].data[1];
     form.signon_realm = url.GetOrigin().spec();
 
@@ skipping 293 matching lines @@
   if (version < 0) {
     wchar_t buffer[128];
     DWORD buffer_length = sizeof(buffer);
     base::win::RegKey reg_key(HKEY_LOCAL_MACHINE,
         L"Software\\Microsoft\\Internet Explorer", KEY_READ);
     LONG result = reg_key.ReadValue(L"Version", buffer, &buffer_length, NULL);
     version = ((result == ERROR_SUCCESS)? _wtoi(buffer) : 0);
   }
   return version;
 }