Revert 222154 "sync: Gracefully handle very early shutdown"

trunk/src/sync/internal_api/test/fake_sync_manager.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 "sync/internal_api/public/test/fake_sync_manager.h"
 
 #include <cstddef>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 73 matching lines @@
     ExtensionsActivity* extensions_activity,
     ChangeDelegate* change_delegate,
     const SyncCredentials& credentials,
     const std::string& invalidator_client_id,
     const std::string& restored_key_for_bootstrapping,
     const std::string& restored_keystore_key_for_bootstrapping,
     InternalComponentsFactory* internal_components_factory,
     Encryptor* encryptor,
     scoped_ptr<UnrecoverableErrorHandler> unrecoverable_error_handler,
     ReportUnrecoverableErrorFunction report_unrecoverable_error_function,
-    bool use_oauth2_token,
-    CancelationSignal* cancelation_signal) {
+    bool use_oauth2_token) {
   sync_task_runner_ = base::ThreadTaskRunnerHandle::Get();
   PurgePartiallySyncedTypes();
 
   test_user_share_.SetUp();
   UserShare* share = test_user_share_.user_share();
   for (ModelTypeSet::Iterator it = initial_sync_ended_types_.First();
        it.Good(); it.Inc()) {
     TestUserShare::CreateRoot(it.Get(), share);
   }
 
@@ skipping 97 matching lines @@
 
 SyncStatus FakeSyncManager::GetDetailedStatus() const {
   NOTIMPLEMENTED();
   return SyncStatus();
 }
 
 void FakeSyncManager::SaveChanges() {
   // Do nothing.
 }
 
+void FakeSyncManager::StopSyncingForShutdown() {
+}
+
 void FakeSyncManager::ShutdownOnSyncThread() {
   DCHECK(sync_task_runner_->RunsTasksOnCurrentThread());
   test_user_share_.TearDown();
 }
 
 UserShare* FakeSyncManager::GetUserShare() {
   return test_user_share_.user_share();
 }
 
 const std::string FakeSyncManager::cache_guid() {
@@ skipping 24 matching lines @@
 
 ModelTypeSet FakeSyncManager::GetLastRefreshRequestTypes() {
   return last_refresh_request_types_;
 }
 
 void FakeSyncManager::OnInvalidatorStateChange(InvalidatorState state) {
   // Do nothing.
 }
 
 }  // namespace syncer