summaryrefslogtreecommitdiffstats
path: root/chrome/test/startup
diff options
context:
space:
mode:
authorerikkay@chromium.org <erikkay@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-24 21:38:27 +0000
committererikkay@chromium.org <erikkay@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-24 21:38:27 +0000
commit16ac16a5d3d646772a32815d66a8ca7b83c0e86c (patch)
treef58051e9c919c8319748492ade0ce0ffb1af81f0 /chrome/test/startup
parentad909020b903f7b701e8fdf8815bff4edd15e0b5 (diff)
downloadchromium_src-16ac16a5d3d646772a32815d66a8ca7b83c0e86c.zip
chromium_src-16ac16a5d3d646772a32815d66a8ca7b83c0e86c.tar.gz
chromium_src-16ac16a5d3d646772a32815d66a8ca7b83c0e86c.tar.bz2
reenable toolstrips for startup tests
BUG=24475 TEST=startup_tests.exe --gtest_filter=*Toolstrip* Review URL: http://codereview.chromium.org/431037 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32974 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/startup')
-rw-r--r--chrome/test/startup/startup_test.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome/test/startup/startup_test.cc b/chrome/test/startup/startup_test.cc
index 4f23ee0..64c4cccf 100644
--- a/chrome/test/startup/startup_test.cc
+++ b/chrome/test/startup/startup_test.cc
@@ -10,6 +10,7 @@
#include "base/time.h"
#include "chrome/common/chrome_constants.h"
#include "chrome/common/chrome_paths.h"
+#include "chrome/common/chrome_switches.h"
#include "chrome/test/ui/ui_test.h"
#include "net/base/net_util.h"
@@ -47,6 +48,9 @@ class StartupTest : public UITest {
data_dir = data_dir.AppendASCII("extensions").AppendASCII("profiles").
AppendASCII(profile);
set_template_user_data(data_dir);
+
+ // For now, these tests still depend on toolstrips.
+ launch_arguments_.AppendSwitch(switches::kEnableExtensionToolstrips);
}
void RunStartupTest(const char* graph, const char* trace,