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"
@@ skipping 91 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),
-      test_server_handle_(base::kNullProcessHandle) {
+      test_server_handle_(base::kNullProcessHandle),
+      use_verifier_prefs_(true) {
   InProcessBrowserTest::set_show_window(true);
   switch (test_type_) {
     case SINGLE_CLIENT: {
       num_clients_ = 1;
       break;
     }
     case TWO_CLIENT: {
       num_clients_ = 2;
       break;
     }
@@ skipping 117 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_prefs_ = 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.
@@ skipping 250 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();
 }