9 files changed, 21 insertions, 4 deletions
diff --git a/chrome/test/automation/autocomplete_edit_proxy.cc b/chrome/test/automation/autocomplete_edit_proxy.cc
index 889f624..3758c74 100644
--- a/chrome/test/automation/autocomplete_edit_proxy.cc
+++ b/chrome/test/automation/autocomplete_edit_proxy.cc
@@ -10,6 +10,9 @@
 #include "chrome/test/automation/automation_messages.h"
 #include "chrome/test/automation/automation_proxy.h"
 
+using base::TimeDelta;
+using base::TimeTicks;
+
 bool AutocompleteEditProxy::GetText(std::wstring* text) const {
   if (!is_valid())
     return false;
diff --git a/chrome/test/automation/automation_proxy.cc b/chrome/test/automation/automation_proxy.cc
index 1724f95..5588ea8 100644
--- a/chrome/test/automation/automation_proxy.cc
+++ b/chrome/test/automation/automation_proxy.cc
@@ -16,6 +16,9 @@
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/automation/window_proxy.h"
 
+using base::TimeDelta;
+using base::TimeTicks;
+
 // This class exists to group together the data and functionality used for
 // synchronous automation requests.
 class AutomationRequest :
@@ -556,4 +559,3 @@ TabProxy* AutomationProxy::CreateExternalTab(HWND* external_tab_container) {
   delete response;
   return tab_proxy;
 }
-
diff --git a/chrome/test/automation/browser_proxy.cc b/chrome/test/automation/browser_proxy.cc
index 8a30c31..ce47335 100644
--- a/chrome/test/automation/browser_proxy.cc
+++ b/chrome/test/automation/browser_proxy.cc
@@ -13,6 +13,9 @@
 #include "chrome/test/automation/automation_proxy.h"
 #include "chrome/test/automation/tab_proxy.h"
 
+using base::TimeDelta;
+using base::TimeTicks;
+
 bool BrowserProxy::ActivateTab(int tab_index) {
   return ActivateTabWithTimeout(tab_index, INFINITE, NULL);
 }
diff --git a/chrome/test/startup/feature_startup_test.cc b/chrome/test/startup/feature_startup_test.cc
index ce37879..59fdfa1 100644
--- a/chrome/test/startup/feature_startup_test.cc
+++ b/chrome/test/startup/feature_startup_test.cc
@@ -15,6 +15,8 @@
 #include "chrome/test/ui/ui_test.h"
 #include "net/base/net_util.h"
 
+using base::TimeDelta;
+
 namespace {
 
 // Returns the directory name where the "typical" user data is that we use for
diff --git a/chrome/test/startup/startup_test.cc b/chrome/test/startup/startup_test.cc
index 583dd58..34f91b9 100644
--- a/chrome/test/startup/startup_test.cc
+++ b/chrome/test/startup/startup_test.cc
@@ -10,6 +10,9 @@
 #include "chrome/test/ui/ui_test.h"
 #include "net/base/net_util.h"
 
+using base::TimeDelta;
+using base::TimeTicks;
+
 namespace {
 
 // Wrapper around CopyFile to retry 10 times if there is an error. 
diff --git a/chrome/test/testing_profile.cc b/chrome/test/testing_profile.cc
index 8abb4ec..235c568 100644
--- a/chrome/test/testing_profile.cc
+++ b/chrome/test/testing_profile.cc
@@ -8,6 +8,8 @@
 #include "chrome/browser/history/history_backend.h"
 #include "chrome/common/chrome_constants.h"
 
+using base::Time;
+
 namespace {
 
 // BookmarkLoadObserver is used when blocking until the BookmarkModel
diff --git a/chrome/test/testing_profile.h b/chrome/test/testing_profile.h
index ea45bc1..9eff18d 100644
--- a/chrome/test/testing_profile.h
+++ b/chrome/test/testing_profile.h
@@ -136,7 +136,7 @@ class TestingProfile : public Profile {
   virtual bool Profile::IsSameProfile(Profile *p) {
     return this == p;
   }
-  virtual Time GetStartTime() const {
+  virtual base::Time GetStartTime() const {
     return start_time_;
   }
   virtual TabRestoreService* GetTabRestoreService() {
@@ -162,7 +162,7 @@ class TestingProfile : public Profile {
   // The path of the profile; the various database and other files are relative
   // to this.
   std::wstring path_;
-  Time start_time_;
+  base::Time start_time_;
   scoped_ptr<PrefService> prefs_;
 
  private:
diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc
index f0aec29..322f02c 100644
--- a/chrome/test/ui/ui_test.cc
+++ b/chrome/test/ui/ui_test.cc
@@ -30,6 +30,8 @@
 #include "googleurl/src/gurl.h"
 #include "net/base/net_util.h"
 
+using base::TimeTicks;
+
 bool UITest::in_process_renderer_ = false;
 bool UITest::in_process_plugins_ = false;
 bool UITest::no_sandbox_ = false;
diff --git a/chrome/test/ui/ui_test.h b/chrome/test/ui/ui_test.h
index 8c67282..f575496 100644
--- a/chrome/test/ui/ui_test.h
+++ b/chrome/test/ui/ui_test.h
@@ -353,7 +353,7 @@ class UITest : public testing::Test {
   std::wstring homepage_;               // Homepage used for testing.
   bool wait_for_initial_loads_;         // Wait for initial loads to complete
                                         // in SetUp() before running test body.
-  TimeTicks browser_launch_time_;       // Time when the browser was run.
+  base::TimeTicks browser_launch_time_; // Time when the browser was run.
   bool dom_automation_enabled_;         // This can be set to true to have the
                                         // test run the dom automation case.
   std::wstring template_user_data_;     // See set_template_user_data().