Retry: sync: Gracefully handle early shutdown

sync/test/engine/syncer_command_test.h

 // 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.
 
 #ifndef SYNC_TEST_ENGINE_SYNCER_COMMAND_TEST_H_
 #define SYNC_TEST_ENGINE_SYNCER_COMMAND_TEST_H_
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop/message_loop.h"
 #include "sync/engine/model_changing_syncer_command.h"
 #include "sync/engine/traffic_recorder.h"
 #include "sync/internal_api/debug_info_event_listener.h"
+#include "sync/internal_api/public/base/cancelation_signal.h"
 #include "sync/internal_api/public/engine/model_safe_worker.h"
 #include "sync/sessions/debug_info_getter.h"
 #include "sync/sessions/sync_session.h"
 #include "sync/sessions/sync_session_context.h"
 #include "sync/syncable/directory.h"
 #include "sync/test/engine/fake_model_worker.h"
 #include "sync/test/engine/mock_connection_manager.h"
 #include "sync/test/engine/test_directory_setter_upper.h"
 #include "sync/util/extensions_activity.h"
 #include "testing/gmock/include/gmock/gmock.h"
@@ skipping 69 matching lines @@
             false,  // force enable pre-commit GU avoidance experiment
             "fake_invalidator_client_id"));
     context_->set_routing_info(routing_info_);
     context_->set_account_name(directory()->name());
     ClearSession();
   }
 
   // Install a MockServerConnection.  Resets the context.  By default,
   // the context does not have a MockServerConnection attached.
   void ConfigureMockServerConnection() {
-    mock_server_.reset(new MockConnectionManager(directory()));
+    mock_server_.reset(new MockConnectionManager(directory(),
+                                                 &cancelation_signal_));
     ResetContext();
   }
 
   virtual syncable::Directory* directory() = 0;
 
   std::vector<scoped_refptr<ModelSafeWorker> >* workers() {
     return &workers_;
   }
 
   const ModelSafeRoutingInfo& routing_info() { return routing_info_; }
@@ skipping 44 matching lines @@
  private:
   base::MessageLoop message_loop_;
   scoped_ptr<sessions::SyncSessionContext> context_;
   scoped_ptr<MockConnectionManager> mock_server_;
   scoped_ptr<sessions::SyncSession> session_;
   std::vector<scoped_refptr<ModelSafeWorker> > workers_;
   ModelSafeRoutingInfo routing_info_;
   DebugInfoEventListener debug_info_event_listener_;
   scoped_refptr<ExtensionsActivity> extensions_activity_;
   TrafficRecorder traffic_recorder_;
+  CancelationSignal cancelation_signal_;
   DISALLOW_COPY_AND_ASSIGN(SyncerCommandTestBase);
 };
 
 class SyncerCommandTest : public SyncerCommandTestBase {
  public:
   virtual void SetUp() OVERRIDE;
   virtual void TearDown() OVERRIDE;
   virtual syncable::Directory* directory() OVERRIDE;
 
  private:
   TestDirectorySetterUpper dir_maker_;
 };
 
 }  // namespace syncer
 
 #endif  // SYNC_TEST_ENGINE_SYNCER_COMMAND_TEST_H_