| Index: components/sync/core_impl/syncapi_server_connection_manager_unittest.cc
|
| diff --git a/sync/internal_api/syncapi_server_connection_manager_unittest.cc b/components/sync/core_impl/syncapi_server_connection_manager_unittest.cc
|
| similarity index 89%
|
| rename from sync/internal_api/syncapi_server_connection_manager_unittest.cc
|
| rename to components/sync/core_impl/syncapi_server_connection_manager_unittest.cc
|
| index f291e7c762b3e5ee8b13ec1901270cc90848e424..c88e9ddca2e60a92a84ead5d5da83c61cd832a8f 100644
|
| --- a/sync/internal_api/syncapi_server_connection_manager_unittest.cc
|
| +++ b/components/sync/core_impl/syncapi_server_connection_manager_unittest.cc
|
| @@ -2,7 +2,7 @@
|
| // 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 "components/sync/core_impl/syncapi_server_connection_manager.h"
|
|
|
| #include "base/bind.h"
|
| #include "base/bind_helpers.h"
|
| @@ -12,10 +12,10 @@
|
| #include "base/test/test_timeouts.h"
|
| #include "base/threading/thread.h"
|
| #include "base/time/time.h"
|
| +#include "components/sync/base/cancelation_signal.h"
|
| +#include "components/sync/core/http_post_provider_factory.h"
|
| +#include "components/sync/core/http_post_provider_interface.h"
|
| #include "net/base/net_errors.h"
|
| -#include "sync/internal_api/public/base/cancelation_signal.h"
|
| -#include "sync/internal_api/public/http_post_provider_factory.h"
|
| -#include "sync/internal_api/public/http_post_provider_interface.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| namespace syncer {
|
| @@ -47,6 +47,7 @@ class BlockingHttpPost : public HttpPostProviderInterface {
|
| return std::string();
|
| }
|
| void Abort() override { wait_for_abort_.Signal(); }
|
| +
|
| private:
|
| base::WaitableEvent wait_for_abort_;
|
| };
|
| @@ -71,8 +72,8 @@ class BlockingHttpPostFactory : public HttpPostProviderFactory {
|
| TEST(SyncAPIServerConnectionManagerTest, VeryEarlyAbortPost) {
|
| CancelationSignal signal;
|
| signal.Signal();
|
| - SyncAPIServerConnectionManager server(
|
| - "server", 0, true, new BlockingHttpPostFactory(), &signal);
|
| + SyncAPIServerConnectionManager server("server", 0, true,
|
| + new BlockingHttpPostFactory(), &signal);
|
|
|
| ServerConnectionManager::PostBufferParams params;
|
|
|
| @@ -86,8 +87,8 @@ TEST(SyncAPIServerConnectionManagerTest, VeryEarlyAbortPost) {
|
| // Ask the ServerConnectionManager to stop before its first request is made.
|
| TEST(SyncAPIServerConnectionManagerTest, EarlyAbortPost) {
|
| CancelationSignal signal;
|
| - SyncAPIServerConnectionManager server(
|
| - "server", 0, true, new BlockingHttpPostFactory(), &signal);
|
| + SyncAPIServerConnectionManager server("server", 0, true,
|
| + new BlockingHttpPostFactory(), &signal);
|
|
|
| ServerConnectionManager::PostBufferParams params;
|
|
|
| @@ -102,8 +103,8 @@ TEST(SyncAPIServerConnectionManagerTest, EarlyAbortPost) {
|
| // Ask the ServerConnectionManager to stop during a request.
|
| TEST(SyncAPIServerConnectionManagerTest, AbortPost) {
|
| CancelationSignal signal;
|
| - SyncAPIServerConnectionManager server(
|
| - "server", 0, true, new BlockingHttpPostFactory(), &signal);
|
| + SyncAPIServerConnectionManager server("server", 0, true,
|
| + new BlockingHttpPostFactory(), &signal);
|
|
|
| ServerConnectionManager::PostBufferParams params;
|
|
|
|
|