Refactor the wait code in ProfileSyncServiceTestHarness.

chrome/test/live_sync/live_sync_test.h

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_TEST_LIVE_SYNC_LIVE_SYNC_TEST_H_
 #define CHROME_TEST_LIVE_SYNC_LIVE_SYNC_TEST_H_
 
 #include "chrome/test/in_process_browser_test.h"
 
 #include "base/scoped_vector.h"
 #include "chrome/test/live_sync/profile_sync_service_test_harness.h"
 #include "net/base/mock_host_resolver.h"
 #include "net/socket/ssl_test_util.h"
 
 #include <string>
 
 class Profile;
 class CommandLine;
 
 namespace net {
 class ScopedDefaultHostResolverProc;
 }
 
 namespace switches {
 extern const wchar_t kSyncUserForTest[];
 extern const wchar_t kSyncPasswordForTest[];
 }
 
+// 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.
 class LiveSyncTest : public InProcessBrowserTest {
  public:
   // The different types of live sync tests that can be implemented.
   enum TestType {
     // Tests where only one client profile is synced with the server. Typically
     // sanity level tests.
     SINGLE_CLIENT,
@@ skipping 10 matching lines @@
     // by stress tests.
     MANY_CLIENT
   };
 
   // A LiveSyncTest must be associated with a particular test type.
   explicit LiveSyncTest(TestType test_type)
       : test_type_(test_type),
         num_clients_(-1),
         started_local_test_server_(false) {
     InProcessBrowserTest::set_show_window(true);
+    InProcessBrowserTest::SetInitialTimeoutInMS(kTestTimeoutInMS);
     switch (test_type_) {
       case SINGLE_CLIENT: {
         num_clients_ = 1;
         break;
       }
       case TWO_CLIENT: {
         num_clients_ = 2;
         break;
       }
       case MULTIPLE_CLIENT: {
@@ skipping 97 matching lines @@
 
   // Sync integration tests need to make live DNS requests for access to
   // GAIA and sync server URLs under google.com. We use a scoped version
   // to override the default resolver while the test is active.
   scoped_ptr<net::ScopedDefaultHostResolverProc> mock_host_resolver_override_;
 
   DISALLOW_COPY_AND_ASSIGN(LiveSyncTest);
 };
 
 #endif  // CHROME_TEST_LIVE_SYNC_LIVE_SYNC_TEST_H_