Merge 94530 - [Sync] Add RequestCleanupDisabledTypes() method to SyncManager

chrome/browser/sync/test_profile_sync_service.cc

Index: chrome/browser/sync/test_profile_sync_service.cc
===================================================================
--- chrome/browser/sync/test_profile_sync_service.cc	(revision 94934)
+++ chrome/browser/sync/test_profile_sync_service.cc	(working copy)
@@ -1,3 +1,4 @@
+// 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.
 
@@ -52,13 +53,7 @@
     bool fail_initial_download)
     : browser_sync::SyncBackendHost(profile),
       synchronous_init_(synchronous_init),
-      fail_initial_download_(fail_initial_download) {
-  ON_CALL(*this, RequestNudge(_)).WillByDefault(
-      testing::Invoke(this,
-                      &SyncBackendHostForProfileSyncTest::
-                      SimulateSyncCycleCompletedInitialSyncEnded));
-  EXPECT_CALL(*this, RequestNudge(_)).Times(testing::AnyNumber());
-}
+      fail_initial_download_(fail_initial_download) {}
 
 SyncBackendHostForProfileSyncTest::~SyncBackendHostForProfileSyncTest() {}