2 files changed, 10 insertions, 1 deletions
diff --git a/chrome/test/live_sync/live_bookmarks_sync_test.h b/chrome/test/live_sync/live_bookmarks_sync_test.h
index 650bd2f..7d52ab5 100644
--- a/chrome/test/live_sync/live_bookmarks_sync_test.h
+++ b/chrome/test/live_sync/live_bookmarks_sync_test.h
@@ -28,6 +28,10 @@ class LiveBookmarksSyncTest : public LiveSyncTest {
   virtual bool SetupClients() {
     if (!LiveSyncTest::SetupClients())
       return false;
+    for (int i = 0; i < num_clients(); ++i) {
+      ui_test_utils::WaitForBookmarkModelToLoad(
+          GetProfile(i)->GetBookmarkModel());
+    }
     verifier_helper_.reset(BookmarkModelVerifier::Create(
         GetVerifierBookmarkModel()));
     return (verifier_helper_.get() != NULL);
diff --git a/chrome/test/live_sync/live_sync_test.h b/chrome/test/live_sync/live_sync_test.h
index 7564c28..dcc4eb5 100644
--- a/chrome/test/live_sync/live_sync_test.h
+++ b/chrome/test/live_sync/live_sync_test.h
@@ -12,6 +12,8 @@
 #include "net/base/mock_host_resolver.h"
 #include "net/socket/ssl_test_util.h"
 
+#include <string>
+
 class Profile;
 class CommandLine;
 
@@ -89,6 +91,9 @@ class LiveSyncTest : public InProcessBrowserTest {
   // Helper to ProfileManager::CreateProfile that handles path creation.
   static Profile* MakeProfile(const FilePath::StringType name);
 
+  // Used to get the number of sync clients used by a test.
+  int num_clients() { return num_clients_; }
+
   // Used to access a particular sync profile.
   Profile* GetProfile(int index);
 
@@ -123,7 +128,7 @@ class LiveSyncTest : public InProcessBrowserTest {
   // GAIA password used by the test case.
   std::string password_;
 
-private:
+ private:
   // Helper method used to create a local python test server.
   virtual void SetUpLocalTestServer();