summaryrefslogtreecommitdiffstats
path: root/chrome/test/ui
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/test/ui')
-rw-r--r--chrome/test/ui/ui_test.cc2
-rw-r--r--chrome/test/ui/ui_test.h2
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().