Move Time, TimeDelta and TimeTicks into namespace base.

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

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

8 files changed, 13 insertions, 5 deletions

diff --git a/chrome/browser/importer/firefox2_importer.cc b/chrome/browser/importer/firefox2_importer.cc
index 59f1778..0594001 100644
--- a/chrome/browser/importer/firefox2_importer.cc
+++ b/chrome/browser/importer/firefox2_importer.cc
@@ -18,6 +18,8 @@
 #include "generated_resources.h"
 #include "net/base/data_url.h"
 
+using base::Time;
+
 // Firefox2Importer.
 
 Firefox2Importer::Firefox2Importer() {
@@ -512,4 +514,3 @@ void Firefox2Importer::DataURLToFaviconUsage(
 
   favicons->push_back(usage);
 }
-
diff --git a/chrome/browser/importer/firefox2_importer.h b/chrome/browser/importer/firefox2_importer.h
index 2c44993..4c55eb0 100644
--- a/chrome/browser/importer/firefox2_importer.h
+++ b/chrome/browser/importer/firefox2_importer.h
@@ -75,7 +75,7 @@ class Firefox2Importer : public Importer {
                                     GURL* url,
                                     GURL* favicon,
                                     std::wstring* shortcut,
-                                    Time* add_date,
+                                    base::Time* add_date,
                                     std::wstring* post_data);
 
   // Fetches the given attribute value from the |tag|. Returns true if
diff --git a/chrome/browser/importer/firefox3_importer.cc b/chrome/browser/importer/firefox3_importer.cc
index 3279130..07f9683 100644
--- a/chrome/browser/importer/firefox3_importer.cc
+++ b/chrome/browser/importer/firefox3_importer.cc
@@ -15,6 +15,8 @@
 #include "chrome/common/time_format.h"
 #include "generated_resources.h"
 
+using base::Time;
+
 // Wraps the function sqlite3_close() in a class that is
 // used in scoped_ptr_malloc.
 
@@ -499,4 +501,3 @@ void Firefox3Importer::LoadFavicons(
     s.reset();
   }
 }
-
diff --git a/chrome/browser/importer/firefox3_importer.h b/chrome/browser/importer/firefox3_importer.h
index d4cc0bc..0accadf 100644
--- a/chrome/browser/importer/firefox3_importer.h
+++ b/chrome/browser/importer/firefox3_importer.h
@@ -48,7 +48,7 @@ class Firefox3Importer : public Importer {
     std::wstring title;
     int type;
     std::string keyword;
-    Time date_added;
+    base::Time date_added;
     int64 favicon;
   };
   typedef std::vector<BookmarkItem*> BookmarkList;
diff --git a/chrome/browser/importer/firefox_importer_unittest.cc b/chrome/browser/importer/firefox_importer_unittest.cc
index d47b133..742a806 100644
--- a/chrome/browser/importer/firefox_importer_unittest.cc
+++ b/chrome/browser/importer/firefox_importer_unittest.cc
@@ -11,6 +11,8 @@
 #include "chrome/browser/importer/firefox_profile_lock.h"
 #include "chrome/common/chrome_paths.h"
 
+using base::Time;
+
 TEST(FirefoxImporterTest, Firefox2NSS3Decryptor) {
   std::wstring nss_path;
   ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &nss_path));
diff --git a/chrome/browser/importer/ie_importer.cc b/chrome/browser/importer/ie_importer.cc
index c4505ff..19f60a1 100644
--- a/chrome/browser/importer/ie_importer.cc
+++ b/chrome/browser/importer/ie_importer.cc
@@ -25,6 +25,8 @@
 
 #include "generated_resources.h"
 
+using base::Time;
+
 namespace {
 
 // Gets the creation time of the given file or directory.
diff --git a/chrome/browser/importer/importer.h b/chrome/browser/importer/importer.h
index 37be870..494cf1c 100644
--- a/chrome/browser/importer/importer.h
+++ b/chrome/browser/importer/importer.h
@@ -73,7 +73,7 @@ class ProfileWriter : public base::RefCounted<ProfileWriter> {
     GURL url;
     std::vector<std::wstring> path;
     std::wstring title;
-    Time creation_time;
+    base::Time creation_time;
 
     BookmarkEntry() : in_toolbar(false) {}
   };
diff --git a/chrome/browser/importer/mork_reader.cc b/chrome/browser/importer/mork_reader.cc
index 3ae4b6c..4a9c1b2 100644
--- a/chrome/browser/importer/mork_reader.cc
+++ b/chrome/browser/importer/mork_reader.cc
@@ -49,6 +49,8 @@
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/importer/firefox_importer_utils.h"
 
+using base::Time;
+
 namespace {
 
 // Convert a hex character (0-9, A-F) to its corresponding byte value.