Refactor the wait code in ProfileSyncServiceTestHarness.

chrome/test/live_sync/live_sync_test.h

Index: chrome/test/live_sync/live_sync_test.h
diff --git a/chrome/test/live_sync/live_sync_test.h b/chrome/test/live_sync/live_sync_test.h
index dcc4eb56f4405b38dcc9abbeb41878877fc01847..71dbbdccb0223e1297f94f58247fa0e42462da74 100644
--- a/chrome/test/live_sync/live_sync_test.h
+++ b/chrome/test/live_sync/live_sync_test.h
@@ -26,6 +26,9 @@ 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.
@@ -56,6 +59,7 @@ class LiveSyncTest : public InProcessBrowserTest {
         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;