[Sync] Remove ScopedServerStatusWatcher

sync/test/engine/mock_connection_manager.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.
 //
 // Mock ServerConnectionManager class for use in client unit tests.
 
 #ifndef SYNC_TEST_ENGINE_MOCK_CONNECTION_MANAGER_H_
 #define SYNC_TEST_ENGINE_MOCK_CONNECTION_MANAGER_H_
 
 #include <bitset>
@@ skipping 22 matching lines @@
     virtual ~MidCommitObserver() {}
   };
 
   MockConnectionManager(syncable::Directory*,
                         CancelationSignal* signal);
   ~MockConnectionManager() override;
 
   // Overridden ServerConnectionManager functions.
   bool PostBufferToPath(PostBufferParams*,
                         const std::string& path,
-                        const std::string& auth_token,
-                        ScopedServerStatusWatcher* watcher) override;
+                        const std::string& auth_token) override;
 
   // Control of commit response.
   // NOTE: Commit callback is invoked only once then reset.
   void SetMidCommitCallback(const base::Closure& callback);
   void SetMidCommitObserver(MidCommitObserver* observer);
 
   // Set this if you want commit to perform commit time rename. Will request
   // that the client renames all commited entries, prepending this string.
   void SetCommitTimeRename(const std::string& prepend);
 
@@ skipping 328 matching lines @@
 
   // Whether we are faking a server mandating clients to throttle requests.
   // Protected by |response_code_override_lock_|.
   bool throttling_;
 
   // Whether we are faking a server mandating clients to partial throttle
   // requests.
   // Protected by |response_code_override_lock_|.
   bool partialThrottling_;
 
-  // Whether we are failing all requests by returning
-  // ClientToServerResponse::AUTH_INVALID.
-  // Protected by |response_code_override_lock_|.
-  bool fail_with_auth_invalid_;
-
   base::Lock response_code_override_lock_;
 
   // True if we are only accepting GetUpdatesCallerInfo::PERIODIC requests.
   bool fail_non_periodic_get_updates_;
 
   scoped_ptr<sync_pb::ClientCommand> gu_client_command_;
   scoped_ptr<sync_pb::ClientCommand> commit_client_command_;
 
   // The next value to use for the position_in_parent property.
   int64 next_position_in_parent_;
@@ skipping 12 matching lines @@
   std::string next_token_;
 
   std::vector<sync_pb::ClientToServerMessage> requests_;
 
   DISALLOW_COPY_AND_ASSIGN(MockConnectionManager);
 };
 
 }  // namespace syncer
 
 #endif  // SYNC_TEST_ENGINE_MOCK_CONNECTION_MANAGER_H_