| Index: chrome/browser/sync/test/integration/sync_test.cc
|
| diff --git a/chrome/browser/sync/test/integration/sync_test.cc b/chrome/browser/sync/test/integration/sync_test.cc
|
| index b5b0f3fab57180c43a6b485ee7d5b043caab57a4..16214c3a33a294fc51a78437f30a9765ba3aa8f7 100644
|
| --- a/chrome/browser/sync/test/integration/sync_test.cc
|
| +++ b/chrome/browser/sync/test/integration/sync_test.cc
|
| @@ -111,8 +111,7 @@ SyncTest::SyncTest(TestType test_type)
|
| 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: {
|
| @@ -367,15 +366,6 @@ bool SyncTest::SetupSync() {
|
| // 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;
|
| }
|
|
|
| @@ -868,10 +858,6 @@ void SyncTest::TriggerCreateSyncedBookmarks() {
|
| 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);
|
|
|