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

9 files changed, 19 insertions, 4 deletions

diff --git a/webkit/default_plugin/plugin_database_handler.cc b/webkit/default_plugin/plugin_database_handler.cc
index 1a35285..2a1ed26 100644
--- a/webkit/default_plugin/plugin_database_handler.cc
+++ b/webkit/default_plugin/plugin_database_handler.cc
@@ -13,6 +13,9 @@
 #include "webkit/default_plugin/plugin_impl.h"
 #include "webkit/default_plugin/plugin_main.h"
 
+using base::Time;
+using base::TimeDelta;
+
 PluginDatabaseHandler::PluginDatabaseHandler(
     PluginInstallerImpl& plugin_installer_instance)
     : plugin_downloads_file_(INVALID_HANDLE_VALUE),
diff --git a/webkit/glue/password_form.h b/webkit/glue/password_form.h
index 9afadc8..aa577e3 100644
--- a/webkit/glue/password_form.h
+++ b/webkit/glue/password_form.h
@@ -124,7 +124,7 @@ struct PasswordForm {
   // When the login was saved (by chrome).
   //
   // When parsing an HTML form, this is not used.
-  Time date_created;
+  base::Time date_created;
 
   // Tracks if the user opted to never remember passwords for this form. Default
   // to false.
diff --git a/webkit/glue/plugins/plugin_list.cc b/webkit/glue/plugins/plugin_list.cc
index 02b52ac..7ef4b92 100644
--- a/webkit/glue/plugins/plugin_list.cc
+++ b/webkit/glue/plugins/plugin_list.cc
@@ -23,6 +23,9 @@
 #include "webkit/glue/plugins/plugin_lib.h"
 #include "googleurl/src/gurl.h"
 
+using base::TimeDelta;
+using base::TimeTicks;
+
 namespace NPAPI
 {
 
diff --git a/webkit/glue/resource_handle_impl.cc b/webkit/glue/resource_handle_impl.cc
index 058a6ca..7db50ca 100644
--- a/webkit/glue/resource_handle_impl.cc
+++ b/webkit/glue/resource_handle_impl.cc
@@ -59,6 +59,8 @@ MSVC_POP_WARNING();
 #include "net/base/load_flags.h"
 
 using webkit_glue::ResourceLoaderBridge;
+using base::Time;
+using base::TimeDelta;
 using net::HttpResponseHeaders;
 
 namespace {
@@ -751,4 +753,3 @@ bool ResourceHandle::willLoadFromCache(ResourceRequest& request) {
 }
 
 }  // namespace WebCore
-
diff --git a/webkit/glue/resource_loader_bridge.h b/webkit/glue/resource_loader_bridge.h
index 15414ae..ce09b21 100644
--- a/webkit/glue/resource_loader_bridge.h
+++ b/webkit/glue/resource_loader_bridge.h
@@ -36,11 +36,11 @@ class ResourceLoaderBridge {
   struct ResponseInfo {
     // The time at which the request was made that resulted in this response.
     // For cached responses, this time could be "far" in the past.
-    Time request_time;
+    base::Time request_time;
 
     // The time at which the response headers were received.  For cached
     // responses, this time could be "far" in the past.
-    Time response_time;
+    base::Time response_time;
 
     // The response headers or NULL if the URL type does not support headers.
     scoped_refptr<net::HttpResponseHeaders> headers;
diff --git a/webkit/glue/webframe_impl.cc b/webkit/glue/webframe_impl.cc
index bdbcc77..f9e9c5f 100644
--- a/webkit/glue/webframe_impl.cc
+++ b/webkit/glue/webframe_impl.cc
@@ -154,6 +154,7 @@ MSVC_POP_WARNING();
 #include "bridge/runtime_object.h"
 #endif
 
+using base::Time;
 using WebCore::ChromeClientChromium;
 using WebCore::Color;
 using WebCore::Document;
diff --git a/webkit/port/platform/chromium/SystemTimeChromium.cpp b/webkit/port/platform/chromium/SystemTimeChromium.cpp
index fe3f6d6..bd93574 100644
--- a/webkit/port/platform/chromium/SystemTimeChromium.cpp
+++ b/webkit/port/platform/chromium/SystemTimeChromium.cpp
@@ -29,6 +29,8 @@
 #include "NotImplemented.h"
 #include "base/time.h"
 
+using base::Time;
+
 namespace WebCore {
 
 // Get the current time in seconds since epoch.
diff --git a/webkit/tools/test_shell/event_sending_controller.cc b/webkit/tools/test_shell/event_sending_controller.cc
index 69bae35..12e69d3 100644
--- a/webkit/tools/test_shell/event_sending_controller.cc
+++ b/webkit/tools/test_shell/event_sending_controller.cc
@@ -30,6 +30,9 @@
 // TODO(mpcomplete): layout before each event?
 // TODO(mpcomplete): do we need modifiers for mouse events?
 
+using base::Time;
+using base::TimeTicks;
+
 TestShell* EventSendingController::shell_ = NULL;
 gfx::Point EventSendingController::last_mouse_pos_;
 WebMouseEvent::Button EventSendingController::pressed_button_ = 
diff --git a/webkit/tools/test_shell/image_decoder_unittest.cc b/webkit/tools/test_shell/image_decoder_unittest.cc
index 8c954cf..d8df2e0 100644
--- a/webkit/tools/test_shell/image_decoder_unittest.cc
+++ b/webkit/tools/test_shell/image_decoder_unittest.cc
@@ -14,6 +14,8 @@
 #include "base/time.h"
 #include "webkit/tools/test_shell/image_decoder_unittest.h"
 
+using base::Time;
+
 void ReadFileToVector(const std::wstring& path, Vector<char>* contents) {
   std::string contents_str;
   file_util::ReadFileToString(path, &contents_str);