diff options
| author | dsh@google.com <dsh@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-27 20:43:33 +0000 |
|---|---|---|
| committer | dsh@google.com <dsh@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-27 20:43:33 +0000 |
| commit | e1acf6f902e50222baf99bfb492ecc38a1604975 (patch) | |
| tree | 503d45705b14be7e2f1ed86c71d6064abbf90fbe /chrome/test/ui | |
| parent | a2f5993e1ce940e8a8eec900abaeed02e2eee09b (diff) | |
| download | chromium_src-e1acf6f902e50222baf99bfb492ecc38a1604975.zip chromium_src-e1acf6f902e50222baf99bfb492ecc38a1604975.tar.gz chromium_src-e1acf6f902e50222baf99bfb492ecc38a1604975.tar.bz2 | |
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
Diffstat (limited to 'chrome/test/ui')
| -rw-r--r-- | chrome/test/ui/ui_test.cc | 2 | ||||
| -rw-r--r-- | chrome/test/ui/ui_test.h | 2 |
2 files changed, 3 insertions, 1 deletions
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(). |