summaryrefslogtreecommitdiffstats
path: root/chrome/test/test_switches.cc
diff options
context:
space:
mode:
authorrsimha@chromium.org <rsimha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-15 00:16:23 +0000
committerrsimha@chromium.org <rsimha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-15 00:16:23 +0000
commit45e4701d3e5db42491a0fa8e30c0b11157d1649c (patch)
tree70d3ccb32b56f7112bdf029d6d6222d9541919c0 /chrome/test/test_switches.cc
parent183d7e61b7b50a62a4338dbaccae86e8d125f348 (diff)
downloadchromium_src-45e4701d3e5db42491a0fa8e30c0b11157d1649c.zip
chromium_src-45e4701d3e5db42491a0fa8e30c0b11157d1649c.tar.gz
chromium_src-45e4701d3e5db42491a0fa8e30c0b11157d1649c.tar.bz2
Stabilize sync integration tests
This patch contains more updates to the ProfileSyncServiceTestHarness class, in light of recent changes to the sync startup sequence, and new tests that require support for offline scenarios. BUG=53858,54743,52007 TEST=sync_integration_tests Review URL: http://codereview.chromium.org/3399002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59463 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/test_switches.cc')
-rw-r--r--chrome/test/test_switches.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/test/test_switches.cc b/chrome/test/test_switches.cc
index 9fbf153..3eb1dd2 100644
--- a/chrome/test/test_switches.cc
+++ b/chrome/test/test_switches.cc
@@ -10,6 +10,9 @@ const char switches::kExtraChromeFlags[] = "extra-chrome-flags";
// Enable displaying error dialogs (for debugging).
const char switches::kEnableErrorDialogs[] = "enable-errdialogs";
+// Time (in milliseconds) for which we wait for live operations to complete.
+const char switches::kLiveOperationTimeout[] = "live-operation-timeout";
+
// Number of iterations that page cycler tests will run.
const char switches::kPageCyclerIterations[] = "page-cycler-iterations";