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

chrome/browser/importer/nss_decryptor_mac.h

 // Copyright (c) 2010 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_NSS_DECRYPTOR_MAC_H_
 #define CHROME_BROWSER_IMPORTER_NSS_DECRYPTOR_MAC_H_
 #pragma once
 
 #include <string>
 #include <vector>
@@ skipping 87 matching lines @@
 typedef PK11SlotInfo* (*PK11GetInternalKeySlotFunc)(void);
 typedef void (*PK11FreeSlotFunc)(PK11SlotInfo *slot);
 typedef SECStatus (*PK11CheckUserPasswordFunc)(PK11SlotInfo *slot, char *pw);
 typedef SECStatus
     (*PK11AuthenticateFunc)(PK11SlotInfo *slot, PRBool loadCerts, void *wincx);
 typedef SECStatus
     (*PK11SDRDecryptFunc)(SECItem *data, SECItem *result, void *cx);
 typedef void (*SECITEMFreeItemFunc)(SECItem *item, PRBool free_it);
 typedef void (*PLArenaFinishFunc)(void);
 typedef PRStatus (*PRCleanupFunc)(void);
-namespace webkit_glue {
+
+namespace webkit {
+namespace forms {
 struct PasswordForm;
 }
+}
 
 // A wrapper for Firefox NSS decrypt component.
 class NSSDecryptor {
  public:
   NSSDecryptor()
       : NSS_Init(NULL), NSS_Shutdown(NULL), PK11_GetInternalKeySlot(NULL),
         PK11_CheckUserPassword(NULL), PK11_FreeSlot(NULL),
         PK11_Authenticate(NULL), PK11SDR_Decrypt(NULL), SECITEM_FreeItem(NULL),
         is_nss_initialized_(false) {}
   ~NSSDecryptor();
 
   // Initializes NSS if it hasn't already been initialized.
   bool Init(const FilePath& dll_path, const FilePath& db_path);
 
   // Decrypts Firefox stored passwords. Before using this method,
   // make sure Init() returns true.
   string16 Decrypt(const std::string& crypt) const;
 
   // Parses the Firefox password file content, decrypts the
   // username/password and reads other related information.
   // The result will be stored in |forms|.
   void ParseSignons(const std::string& content,
-                    std::vector<webkit_glue::PasswordForm>* forms);
+                    std::vector<webkit::forms::PasswordForm>* forms);
 
   // Reads and parses the Firefox password sqlite db, decrypts the
   // username/password and reads other related information.
   // The result will be stored in |forms|.
   bool ReadAndParseSignons(const FilePath& sqlite_file,
-                           std::vector<webkit_glue::PasswordForm>* forms);
+                           std::vector<webkit::forms::PasswordForm>* forms);
  private:
   PK11SlotInfo* GetKeySlotForDB() const { return PK11_GetInternalKeySlot(); }
   void FreeSlot(PK11SlotInfo* slot) const { PK11_FreeSlot(slot); }
 
   // Methods in Firefox security components.
   NSSInitFunc NSS_Init;
   NSSShutdownFunc NSS_Shutdown;
   PK11GetInternalKeySlotFunc PK11_GetInternalKeySlot;
   PK11CheckUserPasswordFunc PK11_CheckUserPassword;
   PK11FreeSlotFunc PK11_FreeSlot;
   PK11AuthenticateFunc PK11_Authenticate;
   PK11SDRDecryptFunc PK11SDR_Decrypt;
   SECITEMFreeItemFunc SECITEM_FreeItem;
 
   // True if NSS_Init() has been called
   bool is_nss_initialized_;
 
   DISALLOW_COPY_AND_ASSIGN(NSSDecryptor);
 };
 
 #endif  // CHROME_BROWSER_IMPORTER_NSS_DECRYPTOR_MAC_H_