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

5 files changed, 15 insertions, 9 deletions

diff --git a/chrome/browser/webdata/web_data_service.cc b/chrome/browser/webdata/web_data_service.cc
index 48eebd8..fd0e60a 100644
--- a/chrome/browser/webdata/web_data_service.cc
+++ b/chrome/browser/webdata/web_data_service.cc
@@ -20,6 +20,8 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
+using base::Time;
+
 WebDataService::WebDataService() : should_commit_(false),
                                    next_request_handle_(1),
                                    thread_(NULL),
diff --git a/chrome/browser/webdata/web_data_service.h b/chrome/browser/webdata/web_data_service.h
index d7e428d..25a4e27 100644
--- a/chrome/browser/webdata/web_data_service.h
+++ b/chrome/browser/webdata/web_data_service.h
@@ -314,11 +314,11 @@ class WebDataService : public base::RefCountedThreadSafe<WebDataService> {
   void RemoveIE7Login(const IE7PasswordInfo& info);
 
   // Removes all logins created in the specified daterange
-  void RemoveLoginsCreatedBetween(const Time delete_begin,
-                                  const Time delete_end);
+  void RemoveLoginsCreatedBetween(const base::Time delete_begin,
+                                  const base::Time delete_end);
 
   // Removes all logins created on or after the date passed in.
-  void RemoveLoginsCreatedAfter(const Time delete_begin);
+  void RemoveLoginsCreatedAfter(const base::Time delete_begin);
 
   // Gets a list of password forms that match |form|.
   // |consumer| will be notified when the request is done. The result is of
@@ -407,7 +407,8 @@ class WebDataService : public base::RefCountedThreadSafe<WebDataService> {
   void UpdateLoginImpl(GenericRequest<PasswordForm>* request);
   void RemoveLoginImpl(GenericRequest<PasswordForm>* request);
   void RemoveIE7LoginImpl(GenericRequest<IE7PasswordInfo>* request);
-  void RemoveLoginsCreatedBetweenImpl(GenericRequest2<Time, Time>* request);
+  void RemoveLoginsCreatedBetweenImpl(
+      GenericRequest2<base::Time, base::Time>* request);
   void GetLoginsImpl(GenericRequest<PasswordForm>* request);
   void GetIE7LoginImpl(GenericRequest<IE7PasswordInfo>* request);
   void GetAllAutofillableLoginsImpl(WebDataRequest* request);
@@ -481,4 +482,3 @@ class WebDataServiceConsumer {
 };
 
 #endif  // CHROME_BROWSER_WEBDATA_WEB_DATA_SERVICE_H__
-
diff --git a/chrome/browser/webdata/web_database.cc b/chrome/browser/webdata/web_database.cc
index 04be9fc..5e14723 100644
--- a/chrome/browser/webdata/web_database.cc
+++ b/chrome/browser/webdata/web_database.cc
@@ -73,6 +73,8 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
+using base::Time;
+
 // Current version number.
 static const int kCurrentVersionNumber = 21;
 
@@ -883,4 +885,3 @@ void WebDatabase::MigrateOldVersionsAsNeeded() {
       return;
   }
 }
-
diff --git a/chrome/browser/webdata/web_database.h b/chrome/browser/webdata/web_database.h
index 176e70f..386bf6c 100644
--- a/chrome/browser/webdata/web_database.h
+++ b/chrome/browser/webdata/web_database.h
@@ -14,7 +14,7 @@
 #include "chrome/common/sqlite_utils.h"
 #include "skia/include/SkBitmap.h"
 
-class Time;
+class base::Time;
 struct PasswordForm;
 struct IE7PasswordInfo;
 
@@ -91,8 +91,8 @@ class WebDatabase {
   // Removes all logins created from |delete_begin| onwards (inclusive) and
   // before |delete_end|. You may use a null Time value to do an unbounded
   // delete in either direction.
-  bool RemoveLoginsCreatedBetween(const Time delete_begin,
-                                  const Time delete_end);
+  bool RemoveLoginsCreatedBetween(const base::Time delete_begin,
+                                  const base::Time delete_end);
 
   // Loads a list of matching password forms into the specified vector |forms|.
   // The list will contain all possibly relevant entries to the observed |form|,
diff --git a/chrome/browser/webdata/web_database_unittest.cc b/chrome/browser/webdata/web_database_unittest.cc
index f6049cb..d4e0cf1 100644
--- a/chrome/browser/webdata/web_database_unittest.cc
+++ b/chrome/browser/webdata/web_database_unittest.cc
@@ -16,6 +16,9 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/glue/password_form.h"
 
+using base::Time;
+using base::TimeDelta;
+
 class WebDatabaseTest : public testing::Test {
  protected: