summaryrefslogtreecommitdiffstats
path: root/chrome/test/ui/ui_test.h
diff options
context:
space:
mode:
authorerg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-15 17:52:17 +0000
committererg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-15 17:52:17 +0000
commita59db43dff855a13a5d1f57865f2afacfd2c6241 (patch)
tree1fd8e2dee4b946169f620f69619d272606f844f0 /chrome/test/ui/ui_test.h
parentdf9f42a8eab0069a781a07019da66a5a2a094e66 (diff)
downloadchromium_src-a59db43dff855a13a5d1f57865f2afacfd2c6241.zip
chromium_src-a59db43dff855a13a5d1f57865f2afacfd2c6241.tar.gz
chromium_src-a59db43dff855a13a5d1f57865f2afacfd2c6241.tar.bz2
Revert "Rebuild test history databases when starting up performance_ui_tests."
This reverts commit fd99334e881859262199c9b8a98f9fbb003b20e1. BUG=111570 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@200312 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/ui/ui_test.h')
-rw-r--r--chrome/test/ui/ui_test.h13
1 files changed, 13 insertions, 0 deletions
diff --git a/chrome/test/ui/ui_test.h b/chrome/test/ui/ui_test.h
index 02d759a..1ce731b 100644
--- a/chrome/test/ui/ui_test.h
+++ b/chrome/test/ui/ui_test.h
@@ -45,6 +45,12 @@ class FilePath;
// rather than UITestBase.
class UITestBase {
public:
+ // Profile theme type choices.
+ enum ProfileType {
+ DEFAULT_THEME = 0,
+ COMPLEX_THEME = 1,
+ };
+
// ********* Utility functions *********
// Launches the browser only.
@@ -142,6 +148,10 @@ class UITestBase {
// Gets the executable file path of the Chrome browser process.
const base::FilePath::CharType* GetExecutablePath();
+ // Returns the directory name where the "typical" user data is that we use
+ // for testing.
+ static base::FilePath ComputeTypicalUserDataSource(ProfileType profile_type);
+
// Return the user data directory being used by the browser instance in
// UITest::SetUp().
base::FilePath user_data_dir() const {
@@ -318,6 +328,9 @@ class UITestBase {
// Launches browser and AutomationProxy.
scoped_ptr<ProxyLauncher> launcher_;
+ // Are we using a profile with a complex theme?
+ ProfileType profile_type_;
+
// PID file for websocket server.
base::FilePath websocket_pid_file_;