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, 16 insertions, 7 deletions

diff --git a/chrome/browser/bookmarks/bookmark_codec.cc b/chrome/browser/bookmarks/bookmark_codec.cc
index d37f830..1bea43e 100644
--- a/chrome/browser/bookmarks/bookmark_codec.cc
+++ b/chrome/browser/bookmarks/bookmark_codec.cc
@@ -12,6 +12,8 @@
 
 #include "generated_resources.h"
 
+using base::Time;
+
 // Key names.
 static const wchar_t* kRootsKey = L"roots";
 static const wchar_t* kRootFolderNameKey = L"bookmark_bar";
@@ -193,4 +195,3 @@ bool BookmarkCodec::DecodeNode(BookmarkModel* model,
       Time::FromInternalValue(StringToInt64(date_added_string));
   return true;
 }
-
diff --git a/chrome/browser/bookmarks/bookmark_model.cc b/chrome/browser/bookmarks/bookmark_model.cc
index 14430a3..ceb1ca9 100644
--- a/chrome/browser/bookmarks/bookmark_model.cc
+++ b/chrome/browser/bookmarks/bookmark_model.cc
@@ -13,6 +13,8 @@
 
 #include "generated_resources.h"
 
+using base::Time;
+
 namespace {
 
 // Functions used for sorting.
diff --git a/chrome/browser/bookmarks/bookmark_model.h b/chrome/browser/bookmarks/bookmark_model.h
index 2f3f32d..1262a9e 100644
--- a/chrome/browser/bookmarks/bookmark_model.h
+++ b/chrome/browser/bookmarks/bookmark_model.h
@@ -69,11 +69,11 @@ class BookmarkNode : public views::TreeNode<BookmarkNode> {
   }
 
   // Returns the time the bookmark/group was added.
-  Time date_added() const { return date_added_; }
+  base::Time date_added() const { return date_added_; }
 
   // Returns the last time the group was modified. This is only maintained
   // for folders (including the bookmark and other folder).
-  Time date_group_modified() const { return date_group_modified_; }
+  base::Time date_group_modified() const { return date_group_modified_; }
 
   // Convenience for testing if this nodes represents a group. A group is
   // a node whose type is not URL.
@@ -114,10 +114,10 @@ class BookmarkNode : public views::TreeNode<BookmarkNode> {
   history::StarredEntry::Type type_;
 
   // Date we were created.
-  Time date_added_;
+  base::Time date_added_;
 
   // Time last modified. Only used for groups.
-  Time date_group_modified_;
+  base::Time date_group_modified_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkNode);
 };
@@ -292,7 +292,7 @@ class BookmarkModel : public NotificationObserver, public BookmarkService {
                                        int index,
                                        const std::wstring& title,
                                        const GURL& url,
-                                       const Time& creation_time);
+                                       const base::Time& creation_time);
 
   // This is the convenience that makes sure the url is starred or not starred.
   // If is_starred is false, all bookmarks for URL are removed. If is_starred is
@@ -373,7 +373,7 @@ class BookmarkModel : public NotificationObserver, public BookmarkService {
   bool IsValidIndex(BookmarkNode* parent, int index, bool allow_end);
 
   // Sets the date modified time of the specified node.
-  void SetDateGroupModified(BookmarkNode* parent, const Time time);
+  void SetDateGroupModified(BookmarkNode* parent, const base::Time time);
 
   // Creates the bookmark bar/other nodes. These call into
   // CreateRootNodeFromStarredEntry.
diff --git a/chrome/browser/bookmarks/bookmark_model_unittest.cc b/chrome/browser/bookmarks/bookmark_model_unittest.cc
index 9edde81..2136347 100644
--- a/chrome/browser/bookmarks/bookmark_model_unittest.cc
+++ b/chrome/browser/bookmarks/bookmark_model_unittest.cc
@@ -12,6 +12,9 @@
 #include "chrome/views/tree_node_model.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using base::Time;
+using base::TimeDelta;
+
 class BookmarkModelTest : public testing::Test, public BookmarkModelObserver {
  public:
   struct ObserverDetails {
diff --git a/chrome/browser/bookmarks/bookmark_table_model_unittest.cc b/chrome/browser/bookmarks/bookmark_table_model_unittest.cc
index ed2b215..04055ee 100644
--- a/chrome/browser/bookmarks/bookmark_table_model_unittest.cc
+++ b/chrome/browser/bookmarks/bookmark_table_model_unittest.cc
@@ -10,6 +10,9 @@
 
 #include "generated_resources.h"
 
+using base::Time;
+using base::TimeDelta;
+
 // Base class for bookmark model tests.
 // Initial state of the bookmark model is as follows:
 // bb