Extract load times from WebDataSource. Move them to NavigationState.

Move PasswordForm into the webkit_glue namespace.

TEST=none
BUG=10041
R=brettw

Review URL: http://codereview.chromium.org/126190

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18515 0039d316-1c4b-4281-b951-d872f2087c98

8 files changed, 10 insertions, 2 deletions

diff --git a/chrome/browser/importer/firefox2_importer.cc b/chrome/browser/importer/firefox2_importer.cc
index 95f7587d..5885773 100644
--- a/chrome/browser/importer/firefox2_importer.cc
+++ b/chrome/browser/importer/firefox2_importer.cc
@@ -20,6 +20,7 @@
 #include "net/base/data_url.h"
 
 using base::Time;
+using webkit_glue::PasswordForm;
 
 // Firefox2Importer.
 
diff --git a/chrome/browser/importer/firefox3_importer.cc b/chrome/browser/importer/firefox3_importer.cc
index 60be97c..0c6571d 100644
--- a/chrome/browser/importer/firefox3_importer.cc
+++ b/chrome/browser/importer/firefox3_importer.cc
@@ -16,6 +16,7 @@
 #include "grit/generated_resources.h"
 
 using base::Time;
+using webkit_glue::PasswordForm;
 
 // Wraps the function sqlite3_close() in a class that is
 // used in scoped_ptr_malloc.
diff --git a/chrome/browser/importer/firefox_importer_utils.cc b/chrome/browser/importer/firefox_importer_utils.cc
index 8380290..47816c8 100644
--- a/chrome/browser/importer/firefox_importer_utils.cc
+++ b/chrome/browser/importer/firefox_importer_utils.cc
@@ -21,6 +21,7 @@
 #include "googleurl/src/gurl.h"
 #include "net/base/base64.h"
 
+using webkit_glue::PasswordForm;
 
 namespace {
 
diff --git a/chrome/browser/importer/firefox_importer_utils.h b/chrome/browser/importer/firefox_importer_utils.h
index 14c0c7a..cb44b1c 100644
--- a/chrome/browser/importer/firefox_importer_utils.h
+++ b/chrome/browser/importer/firefox_importer_utils.h
@@ -190,7 +190,7 @@ class NSSDecryptor {
   // username/password and reads other related information.
   // The result will be stored in |forms|.
   void ParseSignons(const std::string& content,
-                    std::vector<PasswordForm>* forms);
+                    std::vector<webkit_glue::PasswordForm>* forms);
 
  private:
   // Methods in Firefox security components.
diff --git a/chrome/browser/importer/ie_importer.cc b/chrome/browser/importer/ie_importer.cc
index 4ccfdf8..3862437 100644
--- a/chrome/browser/importer/ie_importer.cc
+++ b/chrome/browser/importer/ie_importer.cc
@@ -28,6 +28,7 @@
 #include "grit/generated_resources.h"
 
 using base::Time;
+using webkit_glue::PasswordForm;
 
 namespace {
 
diff --git a/chrome/browser/importer/importer.cc b/chrome/browser/importer/importer.cc
index b3a36a3..1046cfd 100644
--- a/chrome/browser/importer/importer.cc
+++ b/chrome/browser/importer/importer.cc
@@ -47,6 +47,8 @@
 #include "chrome/browser/gtk/import_lock_dialog_gtk.h"
 #endif
 
+using webkit_glue::PasswordForm;
+
 // ProfileWriter.
 
 bool ProfileWriter::BookmarkModelIsLoaded() const {
diff --git a/chrome/browser/importer/importer.h b/chrome/browser/importer/importer.h
index b42bc20..bce26ee 100644
--- a/chrome/browser/importer/importer.h
+++ b/chrome/browser/importer/importer.h
@@ -94,7 +94,7 @@ class ProfileWriter : public base::RefCounted<ProfileWriter> {
   };
 
   // Helper methods for adding data to local stores.
-  virtual void AddPasswordForm(const PasswordForm& form);
+  virtual void AddPasswordForm(const webkit_glue::PasswordForm& form);
 #if defined(OS_WIN)
   virtual void AddIE7PasswordInfo(const IE7PasswordInfo& info);
 #endif
diff --git a/chrome/browser/importer/importer_unittest.cc b/chrome/browser/importer/importer_unittest.cc
index e732365..d6ab67a 100644
--- a/chrome/browser/importer/importer_unittest.cc
+++ b/chrome/browser/importer/importer_unittest.cc
@@ -22,6 +22,8 @@
 #include "chrome/browser/profile.h"
 #include "chrome/common/chrome_paths.h"
 
+using webkit_glue::PasswordForm;
+
 class ImporterTest : public testing::Test {
  public:
  protected: