[Sync] Remove ScopedServerStatusWatcher

sync/internal_api/syncapi_server_connection_manager_unittest.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/syncapi_server_connection_manager.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/compiler_specific.h"
 #include "base/synchronization/waitable_event.h"
@@ skipping 54 matching lines @@
 }  // namespace
 
 // Ask the ServerConnectionManager to stop before it is created.
 TEST(SyncAPIServerConnectionManagerTest, VeryEarlyAbortPost) {
   CancelationSignal signal;
   signal.Signal();
   SyncAPIServerConnectionManager server(
       "server", 0, true, new BlockingHttpPostFactory(), &signal);
 
   ServerConnectionManager::PostBufferParams params;
-  ScopedServerStatusWatcher watcher(&server, &params.response);
 
-  bool result = server.PostBufferToPath(
-      &params, "/testpath", "testauth", &watcher);
+  bool result = server.PostBufferToPath(&params, "/testpath", "testauth");
 
   EXPECT_FALSE(result);
   EXPECT_EQ(HttpResponse::CONNECTION_UNAVAILABLE,
             params.response.server_status);
 }
 
 // Ask the ServerConnectionManager to stop before its first request is made.
 TEST(SyncAPIServerConnectionManagerTest, EarlyAbortPost) {
   CancelationSignal signal;
   SyncAPIServerConnectionManager server(
       "server", 0, true, new BlockingHttpPostFactory(), &signal);
 
   ServerConnectionManager::PostBufferParams params;
-  ScopedServerStatusWatcher watcher(&server, &params.response);
 
   signal.Signal();
-  bool result = server.PostBufferToPath(
-      &params, "/testpath", "testauth", &watcher);
+  bool result = server.PostBufferToPath(&params, "/testpath", "testauth");
 
   EXPECT_FALSE(result);
   EXPECT_EQ(HttpResponse::CONNECTION_UNAVAILABLE,
             params.response.server_status);
 }
 
 // Ask the ServerConnectionManager to stop during a request.
 TEST(SyncAPIServerConnectionManagerTest, AbortPost) {
   CancelationSignal signal;
   SyncAPIServerConnectionManager server(
       "server", 0, true, new BlockingHttpPostFactory(), &signal);
 
   ServerConnectionManager::PostBufferParams params;
-  ScopedServerStatusWatcher watcher(&server, &params.response);
 
   base::Thread abort_thread("Test_AbortThread");
   ASSERT_TRUE(abort_thread.Start());
   abort_thread.message_loop()->PostDelayedTask(
       FROM_HERE,
       base::Bind(&CancelationSignal::Signal,
                  base::Unretained(&signal)),
       TestTimeouts::tiny_timeout());
 
-  bool result = server.PostBufferToPath(
-      &params, "/testpath", "testauth", &watcher);
+  bool result = server.PostBufferToPath(&params, "/testpath", "testauth");
 
   EXPECT_FALSE(result);
   EXPECT_EQ(HttpResponse::CONNECTION_UNAVAILABLE,
             params.response.server_status);
   abort_thread.Stop();
 }
 
 }  // namespace syncer