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

chrome/browser/importer/profile_writer.h

 // 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.
 
 #ifndef CHROME_BROWSER_IMPORTER_PROFILE_WRITER_H_
 #define CHROME_BROWSER_IMPORTER_PROFILE_WRITER_H_
 #pragma once
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/string16.h"
 #include "base/time.h"
 #include "build/build_config.h"
 #include "chrome/browser/history/history_types.h"
 #include "googleurl/src/gurl.h"
 
 class Profile;
 class TemplateURL;
 
-namespace webkit_glue {
+namespace webkit {
+namespace forms {
 struct PasswordForm;
 }
+}
 
 #if defined(OS_WIN)
 struct IE7PasswordInfo;
 #endif
 
 // ProfileWriter encapsulates profile for writing entries into it.
 // This object must be invoked on UI thread.
 class ProfileWriter : public base::RefCountedThreadSafe<ProfileWriter> {
  public:
   struct BookmarkEntry {
@@ skipping 10 matching lines @@
 
   explicit ProfileWriter(Profile* profile);
 
   // These functions return true if the corresponding model has been loaded.
   // If the models haven't been loaded, the importer waits to run until they've
   // completed.
   virtual bool BookmarkModelIsLoaded() const;
   virtual bool TemplateURLServiceIsLoaded() const;
 
   // Helper methods for adding data to local stores.
-  virtual void AddPasswordForm(const webkit_glue::PasswordForm& form);
+  virtual void AddPasswordForm(const webkit::forms::PasswordForm& form);
 
 #if defined(OS_WIN)
   virtual void AddIE7PasswordInfo(const IE7PasswordInfo& info);
 #endif
 
   virtual void AddHistoryPage(const std::vector<history::URLRow>& page,
                               history::VisitSource visit_source);
 
   virtual void AddHomepage(const GURL& homepage);
 
@@ skipping 40 matching lines @@
 
   virtual ~ProfileWriter();
 
  private:
   Profile* const profile_;
 
   DISALLOW_COPY_AND_ASSIGN(ProfileWriter);
 };
 
 #endif  // CHROME_BROWSER_IMPORTER_PROFILE_WRITER_H_