Draft: Moving code out of ProfileSyncServiceHarness

chrome/browser/sync/test/integration/sync_test.cc

 // Copyright (c) 2012 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/browser/sync/test/integration/sync_test.h"
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
@@ skipping 93 matching lines @@
       new net::ProxyConfigServiceFixed(proxy_config));
   done->Signal();
 }
 
 SyncTest::SyncTest(TestType test_type)
     : test_type_(test_type),
       server_type_(SERVER_TYPE_UNDECIDED),
       num_clients_(-1),
       use_verifier_(true),
       notifications_enabled_(true),
-      test_server_handle_(base::kNullProcessHandle),
-      number_of_default_sync_items_(0) {
+      test_server_handle_(base::kNullProcessHandle) {
   sync_datatype_helper::AssociateWithTest(this);
   switch (test_type_) {
     case SINGLE_CLIENT: {
       num_clients_ = 1;
       break;
     }
     case TWO_CLIENT: {
       num_clients_ = 2;
       break;
     }
@@ skipping 234 matching lines @@
   for (int i = 0; i < num_clients_; ++i) {
     if (!GetClient(i)->SetupSync())
       LOG(FATAL) << "SetupSync() failed.";
   }
 
   // Because clients may modify sync data as part of startup (for example local
   // session-releated data is rewritten), we need to ensure all startup-based
   // changes have propagated between the clients.
   AwaitQuiescence();
 
-  // The number of default entries is the number of entries existing after
-  // sync startup excluding top level folders and other permanent items.
-  // This value must be updated whenever new permanent items are added (although
-  // this should handle new datatype-specific top level folders).
-  number_of_default_sync_items_ = GetClient(0)->GetNumEntries() -
-                                  GetClient(0)->GetNumDatatypes() - 6;
-  DVLOG(1) << "Setting " << number_of_default_sync_items_ << " as default "
-           << " number of entries.";
-
   return true;
 }
 
 void SyncTest::CleanUpOnMainThread() {
   for (size_t i = 0; i < clients_.size(); ++i) {
     clients_[i]->service()->DisableForUser();
   }
 
   // Some of the pending messages might rely on browser windows still being
   // around, so run messages both before and after closing all browsers.
@@ skipping 472 matching lines @@
 
 void SyncTest::TriggerCreateSyncedBookmarks() {
   ASSERT_TRUE(ServerSupportsErrorTriggering());
   std::string path = "chromiumsync/createsyncedbookmarks";
   ui_test_utils::NavigateToURL(browser(), sync_server_.GetURL(path));
   ASSERT_EQ("Synced Bookmarks",
             UTF16ToASCII(browser()->tab_strip_model()->GetActiveWebContents()->
                 GetTitle()));
 }
 
-int SyncTest::NumberOfDefaultSyncItems() const {
-  return number_of_default_sync_items_;
-}
-
 void SyncTest::SetProxyConfig(net::URLRequestContextGetter* context_getter,
                               const net::ProxyConfig& proxy_config) {
   base::WaitableEvent done(false, false);
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&SetProxyConfigCallback, &done,
                  make_scoped_refptr(context_getter), proxy_config));
   done.Wait();
 }
 
 void SyncTest::UseFakeServer() {
   DCHECK_EQ(SERVER_TYPE_UNDECIDED, server_type_);
   server_type_ = IN_PROCESS_FAKE_SERVER;
 }