Allow sync integration tests to operate on multiple datatypes: Preferences + Bookmarks

chrome/test/live_sync/live_sync_test.cc

 // Copyright (c) 2011 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.
 
 #include "chrome/test/live_sync/live_sync_test.h"
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/stringprintf.h"
 #include "base/string_util.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/task.h"
 #include "base/test/test_timeouts.h"
 #include "base/threading/platform_thread.h"
 #include "base/values.h"
 #include "chrome/browser/password_manager/encryptor.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/sync/profile_sync_service_harness.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
+#include "chrome/test/live_sync/sync_datatype_helper.h"
 #include "chrome/test/testing_browser_process.h"
 #include "chrome/test/ui_test_utils.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/common/test_url_fetcher_factory.h"
 #include "content/common/url_fetcher.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/escape.h"
 #include "net/base/network_change_notifier.h"
 #include "net/proxy/proxy_config.h"
@@ skipping 65 matching lines @@
   base::WaitableEvent* done_;
   net::URLRequestContextGetter* url_request_context_getter_;
   net::ProxyConfig proxy_config_;
 };
 
 LiveSyncTest::LiveSyncTest(TestType test_type)
     : sync_server_(net::TestServer::TYPE_SYNC, FilePath()),
       test_type_(test_type),
       server_type_(SERVER_TYPE_UNDECIDED),
       num_clients_(-1),
+      use_verifier_(true),
       test_server_handle_(base::kNullProcessHandle) {
   InProcessBrowserTest::set_show_window(true);
+  SyncDatatypeHelper::AssociateWithTest(this);
   switch (test_type_) {
     case SINGLE_CLIENT: {
       num_clients_ = 1;
       break;
     }
     case TWO_CLIENT: {
       num_clients_ = 2;
       break;
     }
     case MULTIPLE_CLIENT: {
@@ skipping 116 matching lines @@
     LOG(FATAL) << "GetClient(): Index is out of bounds.";
   return clients_[index];
 }
 
 Profile* LiveSyncTest::verifier() {
   if (verifier_.get() == NULL)
     LOG(FATAL) << "SetupClients() has not yet been called.";
   return verifier_.get();
 }
 
+void LiveSyncTest::DisableVerifier() {
+  use_verifier_ = false;
+}
+
 bool LiveSyncTest::SetupClients() {
   if (num_clients_ <= 0)
     LOG(FATAL) << "num_clients_ incorrectly initialized.";
   if (!profiles_.empty() || !clients_.empty())
     LOG(FATAL) << "SetupClients() has already been called.";
 
   // Start up a sync test server if one is needed.
   SetUpTestServerIfRequired();
 
   // Create the required number of sync profiles and clients.
   for (int i = 0; i < num_clients_; ++i) {
     profiles_.push_back(MakeProfile(
         base::StringPrintf(FILE_PATH_LITERAL("Profile%d"), i)));
     EXPECT_FALSE(GetProfile(i) == NULL) << "GetProfile(" << i << ") failed.";
     clients_.push_back(
         new ProfileSyncServiceHarness(GetProfile(i), username_, password_));
     EXPECT_FALSE(GetClient(i) == NULL) << "GetClient(" << i << ") failed.";
+    ui_test_utils::WaitForBookmarkModelToLoad(
+        GetProfile(i)->GetBookmarkModel());
   }
 
   // Create the verifier profile.
   verifier_.reset(MakeProfile(FILE_PATH_LITERAL("Verifier")));
+  ui_test_utils::WaitForBookmarkModelToLoad(verifier()->GetBookmarkModel());
   return (verifier_.get() != NULL);
 }
 
 bool LiveSyncTest::SetupSync() {
   // Create sync profiles and clients if they haven't already been created.
   if (profiles_.empty()) {
     if (!SetupClients())
       LOG(FATAL) << "SetupClients() failed.";
   }
 
@@ skipping 233 matching lines @@
                                   const net::ProxyConfig& proxy_config) {
   base::WaitableEvent done(false, false);
   BrowserThread::PostTask(
       BrowserThread::IO,
       FROM_HERE,
       new SetProxyConfigTask(&done,
                              context_getter,
                              proxy_config));
   done.Wait();
 }