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

chrome/browser/password_manager/native_backend_gnome_x.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_PASSWORD_MANAGER_NATIVE_BACKEND_GNOME_X_H_
 #define CHROME_BROWSER_PASSWORD_MANAGER_NATIVE_BACKEND_GNOME_X_H_
 #pragma once
 
 #include <gnome-keyring.h>
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/time.h"
 #include "chrome/browser/password_manager/password_store_x.h"
 #include "chrome/browser/profiles/profile.h"
 
 class PrefService;
 
-namespace webkit_glue {
+namespace webkit {
+namespace forms {
 struct PasswordForm;
 }
+}
 
 // Many of the gnome_keyring_* functions use variable arguments, which makes
 // them difficult if not impossible to truly wrap in C. Therefore, we use
 // appropriately-typed function pointers and scoping to make the fact that we
 // might be dynamically loading the library almost invisible. As a bonus, we
 // also get a simple way to mock the library for testing. Classes that inherit
 // from GnomeKeyringLoader will use its versions of the gnome_keyring_*
 // functions. Note that it has only static fields.
 class GnomeKeyringLoader {
  protected:
@@ skipping 33 matching lines @@
 class NativeBackendGnome : public PasswordStoreX::NativeBackend,
                            public GnomeKeyringLoader {
  public:
   NativeBackendGnome(LocalProfileId id, PrefService* prefs);
 
   virtual ~NativeBackendGnome();
 
   virtual bool Init() OVERRIDE;
 
   // Implements NativeBackend interface.
-  virtual bool AddLogin(const webkit_glue::PasswordForm& form) OVERRIDE;
-  virtual bool UpdateLogin(const webkit_glue::PasswordForm& form) OVERRIDE;
-  virtual bool RemoveLogin(const webkit_glue::PasswordForm& form) OVERRIDE;
+  virtual bool AddLogin(const webkit::forms::PasswordForm& form) OVERRIDE;
+  virtual bool UpdateLogin(const webkit::forms::PasswordForm& form) OVERRIDE;
+  virtual bool RemoveLogin(const webkit::forms::PasswordForm& form) OVERRIDE;
   virtual bool RemoveLoginsCreatedBetween(
       const base::Time& delete_begin, const base::Time& delete_end) OVERRIDE;
-  virtual bool GetLogins(const webkit_glue::PasswordForm& form,
+  virtual bool GetLogins(const webkit::forms::PasswordForm& form,
                          PasswordFormList* forms) OVERRIDE;
   virtual bool GetLoginsCreatedBetween(const base::Time& get_begin,
                                        const base::Time& get_end,
                                        PasswordFormList* forms) OVERRIDE;
   virtual bool GetAutofillableLogins(PasswordFormList* forms) OVERRIDE;
   virtual bool GetBlacklistLogins(PasswordFormList* forms) OVERRIDE;
 
  private:
   // Adds a login form without checking for one to replace first.
-  bool RawAddLogin(const webkit_glue::PasswordForm& form);
+  bool RawAddLogin(const webkit::forms::PasswordForm& form);
 
   // Reads PasswordForms from the keyring with the given autofillability state.
   bool GetLoginsList(PasswordFormList* forms, bool autofillable);
 
   // Helper for GetLoginsCreatedBetween().
   bool GetAllLogins(PasswordFormList* forms);
 
   // Generates a profile-specific app string based on profile_id_.
   std::string GetProfileSpecificAppString() const;
 
   // Migrates non-profile-specific logins to be profile-specific.
   void MigrateToProfileSpecificLogins();
 
   // The local profile id, used to generate the app string.
   const LocalProfileId profile_id_;
 
   // The pref service to use for persistent migration settings.
   PrefService* prefs_;
 
   // The app string, possibly based on the local profile id.
   std::string app_string_;
 
   // True once MigrateToProfileSpecificLogins() has been attempted.
   bool migrate_tried_;
 
   DISALLOW_COPY_AND_ASSIGN(NativeBackendGnome);
 };
 
 #endif  // CHROME_BROWSER_PASSWORD_MANAGER_NATIVE_BACKEND_GNOME_X_H_