diff options
Diffstat (limited to 'chrome/test/live_sync/live_sync_test.h')
-rw-r--r-- | chrome/test/live_sync/live_sync_test.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/chrome/test/live_sync/live_sync_test.h b/chrome/test/live_sync/live_sync_test.h index 134b200..db5ee0b0 100644 --- a/chrome/test/live_sync/live_sync_test.h +++ b/chrome/test/live_sync/live_sync_test.h @@ -28,9 +28,6 @@ class ProxyConfig; class ScopedDefaultHostResolverProc; } -// Live sync tests are allowed to run for up to 5 minutes. -const int kTestTimeoutInMS = 300000; - // This is the base class for integration tests for all sync data types. Derived // classes must be defined for each sync data type. Individual tests are defined // using the IN_PROC_BROWSER_TEST_F macro. @@ -63,7 +60,6 @@ class LiveSyncTest : public InProcessBrowserTest { test_server_(net::TestServer::TYPE_HTTP, FilePath()), started_local_test_server_(false) { InProcessBrowserTest::set_show_window(true); - InProcessBrowserTest::SetInitialTimeoutInMS(kTestTimeoutInMS); switch (test_type_) { case SINGLE_CLIENT: { num_clients_ = 1; |