Move non_blocking_sync_common.h to internal_api

This CL belongs to a series that implements encryption for non-blocking
types.  It's been split off because it contains a lot of trivial changes
that would make reviewing the meaningful changes more difficult.

The move is required because the next CL will add an
'UpdateResponseList' parameter to SyncContextProxy::ConnectTypeToSync().
The UpdateResponseList is a typedef, and therefore difficult to
forward-declare in the same way as the InitialDataTypeContext.

R=zea
BUG=351005

Review URL: https://codereview.chromium.org/428643003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@285988 0039d316-1c4b-4281-b951-d872f2087c98

18 files changed, 23 insertions, 24 deletions

diff --git a/sync/engine/entity_tracker.cc b/sync/engine/entity_tracker.cc
index c9738b2..0f10906 100644
--- a/sync/engine/entity_tracker.cc
+++ b/sync/engine/entity_tracker.cc
@@ -5,8 +5,8 @@
 #include "sync/engine/entity_tracker.h"
 
 #include "base/logging.h"
-#include "sync/engine/non_blocking_sync_common.h"
 #include "sync/internal_api/public/base/model_type.h"
+#include "sync/internal_api/public/non_blocking_sync_common.h"
 #include "sync/syncable/syncable_util.h"
 #include "sync/util/time.h"
 
diff --git a/sync/engine/model_type_entity.h b/sync/engine/model_type_entity.h
index a457cb3..abc67a9 100644
--- a/sync/engine/model_type_entity.h
+++ b/sync/engine/model_type_entity.h
@@ -10,7 +10,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
 #include "sync/base/sync_export.h"
-#include "sync/engine/non_blocking_sync_common.h"
+#include "sync/internal_api/public/non_blocking_sync_common.h"
 #include "sync/protocol/sync.pb.h"
 
 namespace syncer {
diff --git a/sync/engine/model_type_sync_proxy.h b/sync/engine/model_type_sync_proxy.h
index 7442841..706fbc7 100644
--- a/sync/engine/model_type_sync_proxy.h
+++ b/sync/engine/model_type_sync_proxy.h
@@ -6,7 +6,7 @@
 #define SYNC_ENGINE_MODEL_TYPE_SYNC_PROXY_H_
 
 #include "sync/base/sync_export.h"
-#include "sync/engine/non_blocking_sync_common.h"
+#include "sync/internal_api/public/non_blocking_sync_common.h"
 
 namespace syncer {
 
diff --git a/sync/engine/model_type_sync_proxy_impl.h b/sync/engine/model_type_sync_proxy_impl.h
index 3a988e5..2390eda 100644
--- a/sync/engine/model_type_sync_proxy_impl.h
+++ b/sync/engine/model_type_sync_proxy_impl.h
@@ -9,8 +9,8 @@
 #include "base/stl_util.h"
 #include "base/threading/non_thread_safe.h"
 #include "sync/base/sync_export.h"
-#include "sync/engine/non_blocking_sync_common.h"
 #include "sync/internal_api/public/base/model_type.h"
+#include "sync/internal_api/public/non_blocking_sync_common.h"
 #include "sync/protocol/sync.pb.h"
 
 namespace syncer {
diff --git a/sync/engine/model_type_sync_proxy_impl_unittest.cc b/sync/engine/model_type_sync_proxy_impl_unittest.cc
index f781d16..0597657 100644
--- a/sync/engine/model_type_sync_proxy_impl_unittest.cc
+++ b/sync/engine/model_type_sync_proxy_impl_unittest.cc
@@ -5,8 +5,8 @@
 #include "sync/engine/model_type_sync_proxy_impl.h"
 
 #include "sync/engine/model_type_sync_worker.h"
-#include "sync/engine/non_blocking_sync_common.h"
 #include "sync/internal_api/public/base/model_type.h"
+#include "sync/internal_api/public/non_blocking_sync_common.h"
 #include "sync/internal_api/public/sync_context_proxy.h"
 #include "sync/protocol/sync.pb.h"
 #include "sync/syncable/syncable_util.h"
diff --git a/sync/engine/model_type_sync_worker.h b/sync/engine/model_type_sync_worker.h
index eeb5f88..1396e1a 100644
--- a/sync/engine/model_type_sync_worker.h
+++ b/sync/engine/model_type_sync_worker.h
@@ -5,7 +5,7 @@
 #ifndef SYNC_ENGINE_MODEL_TYPE_SYNC_WORKER_H_
 #define SYNC_ENGINE_MODEL_TYPE_SYNC_WORKER_H_
 
-#include "sync/engine/non_blocking_sync_common.h"
+#include "sync/internal_api/public/non_blocking_sync_common.h"
 
 namespace syncer {
 
diff --git a/sync/engine/model_type_sync_worker_impl.h b/sync/engine/model_type_sync_worker_impl.h
index 69d4156..6905c50 100644
--- a/sync/engine/model_type_sync_worker_impl.h
+++ b/sync/engine/model_type_sync_worker_impl.h
@@ -11,10 +11,10 @@
 #include "sync/base/sync_export.h"
 #include "sync/engine/commit_contributor.h"
 #include "sync/engine/model_type_sync_worker.h"
-#include "sync/engine/non_blocking_sync_common.h"
 #include "sync/engine/nudge_handler.h"
 #include "sync/engine/update_handler.h"
 #include "sync/internal_api/public/base/model_type.h"
+#include "sync/internal_api/public/non_blocking_sync_common.h"
 #include "sync/protocol/sync.pb.h"
 
 namespace base {
diff --git a/sync/engine/model_type_sync_worker_impl_unittest.cc b/sync/engine/model_type_sync_worker_impl_unittest.cc
index 3aaaf3a..0c1fa13 100644
--- a/sync/engine/model_type_sync_worker_impl_unittest.cc
+++ b/sync/engine/model_type_sync_worker_impl_unittest.cc
@@ -6,8 +6,8 @@
 
 #include "sync/engine/commit_contribution.h"
 #include "sync/engine/model_type_sync_proxy.h"
-#include "sync/engine/non_blocking_sync_common.h"
 #include "sync/internal_api/public/base/model_type.h"
+#include "sync/internal_api/public/non_blocking_sync_common.h"
 #include "sync/protocol/sync.pb.h"
 #include "sync/sessions/status_controller.h"
 #include "sync/syncable/syncable_util.h"
diff --git a/sync/engine/non_blocking_type_commit_contribution.cc b/sync/engine/non_blocking_type_commit_contribution.cc
index 39823a5..baa0325 100644
--- a/sync/engine/non_blocking_type_commit_contribution.cc
+++ b/sync/engine/non_blocking_type_commit_contribution.cc
@@ -5,7 +5,7 @@
 #include "sync/engine/non_blocking_type_commit_contribution.h"
 
 #include "sync/engine/model_type_sync_worker_impl.h"
-#include "sync/engine/non_blocking_sync_common.h"
+#include "sync/internal_api/public/non_blocking_sync_common.h"
 #include "sync/protocol/proto_value_conversions.h"
 
 namespace syncer {
diff --git a/sync/engine/non_blocking_sync_common.cc b/sync/internal_api/public/non_blocking_sync_common.cc
index 0042990..983f29f 100644
--- a/sync/engine/non_blocking_sync_common.cc
+++ b/sync/internal_api/public/non_blocking_sync_common.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/engine/non_blocking_sync_common.h"
+#include "sync/internal_api/public/non_blocking_sync_common.h"
 
 namespace syncer {
 
diff --git a/sync/engine/non_blocking_sync_common.h b/sync/internal_api/public/non_blocking_sync_common.h
index cefccfe..7c7580b 100644
--- a/sync/engine/non_blocking_sync_common.h
+++ b/sync/internal_api/public/non_blocking_sync_common.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SYNC_ENGINE_NON_BLOCKING_SYNC_COMMON_H_
-#define SYNC_ENGINE_NON_BLOCKING_SYNC_COMMON_H_
+#ifndef SYNC_INTERNAL_API_PUBLIC_NON_BLOCKING_SYNC_COMMON_H_
+#define SYNC_INTERNAL_API_PUBLIC_NON_BLOCKING_SYNC_COMMON_H_
 
 #include <string>
 #include <vector>
@@ -102,4 +102,4 @@ typedef std::vector<UpdateResponseData> UpdateResponseDataList;
 
 }  // namespace syncer
 
-#endif  // SYNC_ENGINE_NON_BLOCKING_SYNC_COMMON_H_
+#endif  // SYNC_INTERNAL_API_PUBLIC_NON_BLOCKING_SYNC_COMMON_H_
diff --git a/sync/internal_api/sync_context_proxy_impl.cc b/sync/internal_api/sync_context_proxy_impl.cc
index 9e8db1c..7d6a817 100644
--- a/sync/internal_api/sync_context_proxy_impl.cc
+++ b/sync/internal_api/sync_context_proxy_impl.cc
@@ -8,7 +8,7 @@
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
-#include "sync/engine/non_blocking_sync_common.h"
+#include "sync/internal_api/public/non_blocking_sync_common.h"
 #include "sync/internal_api/public/sync_context.h"
 
 namespace syncer {
diff --git a/sync/sessions/model_type_registry.cc b/sync/sessions/model_type_registry.cc
index 69a5488..5222202 100644
--- a/sync/sessions/model_type_registry.cc
+++ b/sync/sessions/model_type_registry.cc
@@ -13,7 +13,7 @@
 #include "sync/engine/model_type_sync_proxy_impl.h"
 #include "sync/engine/model_type_sync_worker.h"
 #include "sync/engine/model_type_sync_worker_impl.h"
-#include "sync/engine/non_blocking_sync_common.h"
+#include "sync/internal_api/public/non_blocking_sync_common.h"
 #include "sync/sessions/directory_type_debug_info_emitter.h"
 
 namespace syncer {
diff --git a/sync/sync_core.gypi b/sync/sync_core.gypi
index 3f4631f..cb6f72f 100644
--- a/sync/sync_core.gypi
+++ b/sync/sync_core.gypi
@@ -80,8 +80,6 @@
     'engine/net/server_connection_manager.h',
     'engine/net/url_translator.cc',
     'engine/net/url_translator.h',
-    'engine/non_blocking_sync_common.cc',
-    'engine/non_blocking_sync_common.h',
     'engine/non_blocking_type_commit_contribution.cc',
     'engine/non_blocking_type_commit_contribution.h',
     'engine/nudge_source.cc',
diff --git a/sync/sync_internal_api.gypi b/sync/sync_internal_api.gypi
index 6e9429d..c714012 100644
--- a/sync/sync_internal_api.gypi
+++ b/sync/sync_internal_api.gypi
@@ -101,6 +101,8 @@
     'internal_api/public/internal_components_factory.h',
     'internal_api/public/internal_components_factory_impl.h',
     'internal_api/public/network_resources.h',
+    'internal_api/public/non_blocking_sync_common.cc',
+    'internal_api/public/non_blocking_sync_common.h',
     'internal_api/public/read_node.h',
     'internal_api/public/read_transaction.h',
     'internal_api/public/sessions/commit_counters.cc',
@@ -127,9 +129,9 @@
     'internal_api/public/util/experiments.h',
     'internal_api/public/util/immutable.h',
     'internal_api/public/util/report_unrecoverable_error_function.h',
+    'internal_api/public/util/sync_db_util.h',
     'internal_api/public/util/sync_string_conversions.cc',
     'internal_api/public/util/sync_string_conversions.h',
-    'internal_api/public/util/sync_db_util.h',
     'internal_api/public/util/syncer_error.cc',
     'internal_api/public/util/syncer_error.h',
     'internal_api/public/util/unrecoverable_error_handler.h',
@@ -153,10 +155,10 @@
     'internal_api/sync_manager_factory.cc',
     'internal_api/sync_manager_impl.cc',
     'internal_api/sync_manager_impl.h',
-    'internal_api/sync_rollback_manager_base.cc',
-    'internal_api/sync_rollback_manager_base.h',
     'internal_api/sync_rollback_manager.cc',
     'internal_api/sync_rollback_manager.h',
+    'internal_api/sync_rollback_manager_base.cc',
+    'internal_api/sync_rollback_manager_base.h',
     'internal_api/syncapi_internal.cc',
     'internal_api/syncapi_internal.h',
     'internal_api/syncapi_server_connection_manager.cc',
diff --git a/sync/test/engine/mock_model_type_sync_proxy.h b/sync/test/engine/mock_model_type_sync_proxy.h
index e6f16a9..271b59f 100644
--- a/sync/test/engine/mock_model_type_sync_proxy.h
+++ b/sync/test/engine/mock_model_type_sync_proxy.h
@@ -10,7 +10,7 @@
 #include "base/callback.h"
 #include "base/macros.h"
 #include "sync/engine/model_type_sync_proxy.h"
-#include "sync/engine/non_blocking_sync_common.h"
+#include "sync/internal_api/public/non_blocking_sync_common.h"
 
 namespace syncer {
 
diff --git a/sync/test/engine/mock_model_type_sync_worker.h b/sync/test/engine/mock_model_type_sync_worker.h
index 5fb96f3..498e9ee 100644
--- a/sync/test/engine/mock_model_type_sync_worker.h
+++ b/sync/test/engine/mock_model_type_sync_worker.h
@@ -9,7 +9,7 @@
 
 #include "base/macros.h"
 #include "sync/engine/model_type_sync_worker.h"
-#include "sync/engine/non_blocking_sync_common.h"
+#include "sync/internal_api/public/non_blocking_sync_common.h"
 
 namespace syncer {
 
diff --git a/sync/test/engine/single_type_mock_server.h b/sync/test/engine/single_type_mock_server.h
index 39ad35c..2e3684c 100644
--- a/sync/test/engine/single_type_mock_server.h
+++ b/sync/test/engine/single_type_mock_server.h
@@ -5,9 +5,8 @@
 #ifndef SYNC_TEST_ENGINE_SINGLE_TYPE_MOCK_SERVER_H_
 #define SYNC_TEST_ENGINE_SINGLE_TYPE_MOCK_SERVER_H_
 
-#include "sync/engine/non_blocking_sync_common.h"
-
 #include "sync/internal_api/public/base/model_type.h"
+#include "sync/internal_api/public/non_blocking_sync_common.h"
 
 namespace syncer {