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

chrome/browser/importer/firefox2_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/firefox2_importer.h"
 
 #include <string>
 #include <vector>
 
 #include "base/file_path.h"
@@ skipping 12 matching lines @@
 #include "chrome/browser/importer/importer_util.h"
 #include "chrome/browser/importer/mork_reader.h"
 #include "chrome/browser/importer/nss_decryptor.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_parser.h"
 #include "chrome/common/time_format.h"
 #include "chrome/common/url_constants.h"
 #include "googleurl/src/gurl.h"
 #include "grit/generated_resources.h"
 #include "net/base/data_url.h"
-#include "webkit/glue/password_form.h"
+#include "webkit/forms/password_form.h"
 
 namespace {
 const char kItemOpen[] = "<DT><A";
 const char kItemClose[] = "</A>";
 const char kFeedURLAttribute[] = "FEEDURL";
 const char kHrefAttribute[] = "HREF";
 const char kIconAttribute[] = "ICON";
 const char kShortcutURLAttribute[] = "SHORTCUTURL";
 const char kAddDateAttribute[] = "ADD_DATE";
 const char kPostDataAttribute[] = "POST_DATA";
@@ skipping 296 matching lines @@
 
   // Firefox 2 uses signons2.txt to store the pssswords. If it doesn't
   // exist, we try to find its older version.
   FilePath file = source_path_.AppendASCII("signons2.txt");
   if (!file_util::PathExists(file)) {
     file = source_path_.AppendASCII("signons.txt");
   }
 
   std::string content;
   file_util::ReadFileToString(file, &content);
-  std::vector<webkit_glue::PasswordForm> forms;
+  std::vector<webkit::forms::PasswordForm> forms;
   decryptor.ParseSignons(content, &forms);
 
   if (!cancelled()) {
     for (size_t i = 0; i < forms.size(); ++i) {
       bridge_->SetPasswordForm(forms[i]);
     }
   }
 }
 
 void Firefox2Importer::ImportHistory() {
@@ skipping 307 matching lines @@
 
   // We need to make up a URL for the favicon. We use a version of the page's
   // URL so that we can be sure it will not collide.
   usage.favicon_url = GURL(std::string("made-up-favicon:") + link_url.spec());
 
   // We only have one URL per favicon for Firefox 2 bookmarks.
   usage.urls.insert(link_url);
 
   favicons->push_back(usage);
 }