Move forms/ out of webkit/.

chrome/browser/importer/ie_importer.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 "chrome/browser/importer/ie_importer.h"
 
 #include <ole2.h>
 #include <intshcut.h>
 #include <pstore.h>
 #include <shlobj.h>
@@ skipping 20 matching lines @@
 #include "base/win/windows_version.h"
 #include "chrome/browser/importer/importer_bridge.h"
 #include "chrome/browser/importer/importer_data_types.h"
 #include "chrome/browser/importer/importer_util.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 "content/public/common/password_form.h"
 #include "googleurl/src/gurl.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "webkit/forms/password_form.h"
 
 namespace {
 
 // Registry key paths from which we import IE settings.
 const char16 kStorage2Path[] =
   L"Software\\Microsoft\\Internet Explorer\\IntelliForms\\Storage2";
 const char16 kSearchScopePath[] =
   L"Software\\Microsoft\\Internet Explorer\\SearchScopes";
 const char16 kIESettingsMain[] =
   L"Software\\Microsoft\\Internet Explorer\\Main";
@@ skipping 547 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::forms::PasswordForm form;
+    content::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 251 matching lines @@
   static int version = -1;
   if (version < 0) {
     wchar_t buffer[128];
     DWORD buffer_length = sizeof(buffer);
     base::win::RegKey reg_key(HKEY_LOCAL_MACHINE, kIEVersionKey, KEY_READ);
     LONG result = reg_key.ReadValue(L"Version", buffer, &buffer_length, NULL);
     version = ((result == ERROR_SUCCESS)? _wtoi(buffer) : 0);
   }
   return version;
 }