diff options
| author | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-07 17:50:19 +0000 |
|---|---|---|
| committer | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-07 17:50:19 +0000 |
| commit | 3f8556a0cf934ee6e2e4a37b22b05dbf0a9c4a90 (patch) | |
| tree | dcb6050b16ce934a4102da5ac7f2d501ceb4e988 /sync | |
| parent | 03c1007443b4be55364755441c83a66ec12cff81 (diff) | |
| download | chromium_src-3f8556a0cf934ee6e2e4a37b22b05dbf0a9c4a90.zip chromium_src-3f8556a0cf934ee6e2e4a37b22b05dbf0a9c4a90.tar.gz chromium_src-3f8556a0cf934ee6e2e4a37b22b05dbf0a9c4a90.tar.bz2 | |
sync: create internal_api/public to house sync/ files needed by chrome/browser/sync.
Note on sync.gyp changes and .cc file moves: most files in /public have .h and their .cc side by side, as they are simple implementations. In some cases like model_type.cc (and others in a follow up patch, like sync_manager.cc) have only their header exposed in /public while the impl stays behind, because it needs to include things from within sync/, and /public has a strict include DEPS policy. This is in accordance with other /public folders (like content/).
Cleans up DEPS files in sync + c/b/sync. Adds sync/{engine, sessions, syncable} to public/. There is more to come (moving things in internal_api/ into public).
Not touching /notifier as that is in flux at the moment.
BUG=131130
TEST=
Review URL: https://chromiumcodereview.appspot.com/10532019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141038 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync')
123 files changed, 244 insertions, 240 deletions
diff --git a/sync/api/DEPS b/sync/api/DEPS index 157d02f..f6dca6a 100644 --- a/sync/api/DEPS +++ b/sync/api/DEPS @@ -1,6 +1,6 @@ include_rules = [ "+sync/internal_api/base_node.h", + "+sync/internal_api/public", "+sync/protocol", - "+sync/syncable/model_type.h", "+sync/util/immutable.h", ] diff --git a/sync/api/sync_data.cc b/sync/api/sync_data.cc index 679c547..bf2aa0b 100644 --- a/sync/api/sync_data.cc +++ b/sync/api/sync_data.cc @@ -11,9 +11,9 @@ #include "base/string_number_conversions.h" #include "base/values.h" #include "sync/internal_api/base_node.h" +#include "sync/internal_api/public/syncable/model_type.h" #include "sync/protocol/proto_value_conversions.h" #include "sync/protocol/sync.pb.h" -#include "sync/syncable/model_type.h" void SyncData::ImmutableSyncEntityTraits::InitializeWrapper( Wrapper* wrapper) { diff --git a/sync/api/sync_data.h b/sync/api/sync_data.h index cef132b..1626f50 100644 --- a/sync/api/sync_data.h +++ b/sync/api/sync_data.h @@ -11,7 +11,7 @@ #include <vector> #include "base/basictypes.h" -#include "sync/syncable/model_type.h" +#include "sync/internal_api/public/syncable/model_type.h" #include "sync/util/immutable.h" namespace sync_pb { diff --git a/sync/api/sync_error.cc b/sync/api/sync_error.cc index 49bf74b..501fa53 100644 --- a/sync/api/sync_error.cc +++ b/sync/api/sync_error.cc @@ -8,7 +8,7 @@ #include "base/location.h" #include "base/logging.h" -#include "sync/syncable/model_type.h" +#include "sync/internal_api/public/syncable/model_type.h" SyncError::SyncError() { Clear(); diff --git a/sync/api/sync_error.h b/sync/api/sync_error.h index 2b6dc93..2bdb9eb 100644 --- a/sync/api/sync_error.h +++ b/sync/api/sync_error.h @@ -10,7 +10,7 @@ #include <string> #include "base/memory/scoped_ptr.h" -#include "sync/syncable/model_type.h" +#include "sync/internal_api/public/syncable/model_type.h" namespace tracked_objects { class Location; diff --git a/sync/api/syncable_service.h b/sync/api/syncable_service.h index bfcab3a..b499a28 100644 --- a/sync/api/syncable_service.h +++ b/sync/api/syncable_service.h @@ -14,7 +14,7 @@ #include "sync/api/sync_change_processor.h" #include "sync/api/sync_data.h" #include "sync/api/sync_error.h" -#include "sync/syncable/model_type.h" +#include "sync/internal_api/public/syncable/model_type.h" class SyncErrorFactory; diff --git a/sync/engine/DEPS b/sync/engine/DEPS index a22ed7d..af825b6 100644 --- a/sync/engine/DEPS +++ b/sync/engine/DEPS @@ -1,5 +1,9 @@ include_rules = [ "+googleurl", + "+sync/internal_api/public/engine", + "+sync/internal_api/public/sessions", + "+sync/internal_api/public/syncable", + "+sync/internal_api/public/util", "+sync/protocol", "+sync/sessions", "+sync/syncable", diff --git a/sync/engine/cleanup_disabled_types_command.cc b/sync/engine/cleanup_disabled_types_command.cc index 35e61cd..4a774b7 100644 --- a/sync/engine/cleanup_disabled_types_command.cc +++ b/sync/engine/cleanup_disabled_types_command.cc @@ -6,9 +6,9 @@ #include <algorithm> +#include "sync/internal_api/public/syncable/model_type.h" #include "sync/sessions/sync_session.h" #include "sync/sessions/sync_session_context.h" -#include "sync/syncable/model_type.h" #include "sync/syncable/syncable.h" namespace browser_sync { diff --git a/sync/engine/cleanup_disabled_types_command_unittest.cc b/sync/engine/cleanup_disabled_types_command_unittest.cc index daa1365..665c68c 100644 --- a/sync/engine/cleanup_disabled_types_command_unittest.cc +++ b/sync/engine/cleanup_disabled_types_command_unittest.cc @@ -6,11 +6,11 @@ #include "sync/engine/cleanup_disabled_types_command.h" +#include "sync/internal_api/public/syncable/model_type_test_util.h" #include "sync/sessions/sync_session.h" -#include "sync/syncable/model_type_test_util.h" #include "sync/test/engine/syncer_command_test.h" -#include "testing/gtest/include/gtest/gtest.h" #include "testing/gmock/include/gmock/gmock.h" +#include "testing/gtest/include/gtest/gtest.h" namespace browser_sync { diff --git a/sync/engine/clear_data_command.h b/sync/engine/clear_data_command.h index 5302871..258a99c 100644 --- a/sync/engine/clear_data_command.h +++ b/sync/engine/clear_data_command.h @@ -7,9 +7,9 @@ #pragma once #include "base/basictypes.h" -#include "sync/engine/model_safe_worker.h" #include "sync/engine/syncer_command.h" -#include "sync/syncable/model_type.h" +#include "sync/internal_api/public/engine/model_safe_worker.h" +#include "sync/internal_api/public/syncable/model_type.h" namespace browser_sync { diff --git a/sync/engine/commit.h b/sync/engine/commit.h index f5ccd79..f03ceb0 100644 --- a/sync/engine/commit.h +++ b/sync/engine/commit.h @@ -6,7 +6,7 @@ #define SYNC_ENGINE_COMMIT_H_ #pragma once -#include "sync/util/syncer_error.h" +#include "sync/internal_api/public/util/syncer_error.h" namespace browser_sync { diff --git a/sync/engine/download_updates_command.cc b/sync/engine/download_updates_command.cc index 385649c..ef41a76 100644 --- a/sync/engine/download_updates_command.cc +++ b/sync/engine/download_updates_command.cc @@ -10,7 +10,7 @@ #include "sync/engine/syncer.h" #include "sync/engine/syncer_proto_util.h" #include "sync/engine/syncproto.h" -#include "sync/syncable/model_type_payload_map.h" +#include "sync/internal_api/public/syncable/model_type_payload_map.h" #include "sync/syncable/syncable.h" using sync_pb::DebugInfo; diff --git a/sync/engine/download_updates_command.h b/sync/engine/download_updates_command.h index 9e71610..5eddcce 100644 --- a/sync/engine/download_updates_command.h +++ b/sync/engine/download_updates_command.h @@ -9,10 +9,10 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/gtest_prod_util.h" -#include "sync/engine/model_safe_worker.h" #include "sync/engine/syncer_command.h" +#include "sync/internal_api/public/engine/model_safe_worker.h" +#include "sync/internal_api/public/syncable/model_type.h" #include "sync/protocol/sync.pb.h" -#include "sync/syncable/model_type.h" namespace sync_pb { class EntitySpecifics; diff --git a/sync/engine/model_changing_syncer_command.h b/sync/engine/model_changing_syncer_command.h index d09e4b7..e2e8956 100644 --- a/sync/engine/model_changing_syncer_command.h +++ b/sync/engine/model_changing_syncer_command.h @@ -7,8 +7,8 @@ #pragma once #include "base/compiler_specific.h" -#include "sync/engine/model_safe_worker.h" #include "sync/engine/syncer_command.h" +#include "sync/internal_api/public/engine/model_safe_worker.h" namespace browser_sync { namespace sessions { diff --git a/sync/engine/model_changing_syncer_command_unittest.cc b/sync/engine/model_changing_syncer_command_unittest.cc index 615ee51..1f1d93d 100644 --- a/sync/engine/model_changing_syncer_command_unittest.cc +++ b/sync/engine/model_changing_syncer_command_unittest.cc @@ -6,8 +6,8 @@ #include "base/compiler_specific.h" #include "base/memory/ref_counted.h" #include "sync/engine/model_changing_syncer_command.h" +#include "sync/internal_api/public/syncable/model_type.h" #include "sync/sessions/sync_session.h" -#include "sync/syncable/model_type.h" #include "sync/test/engine/fake_model_worker.h" #include "sync/test/engine/syncer_command_test.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/sync/engine/nigori_util.h b/sync/engine/nigori_util.h index 67174c3..2adcc9f 100644 --- a/sync/engine/nigori_util.h +++ b/sync/engine/nigori_util.h @@ -9,8 +9,8 @@ #pragma once #include "base/compiler_specific.h" +#include "sync/internal_api/public/syncable/model_type.h" #include "sync/protocol/nigori_specifics.pb.h" -#include "sync/syncable/model_type.h" namespace browser_sync { class Cryptographer; diff --git a/sync/engine/process_updates_command_unittest.cc b/sync/engine/process_updates_command_unittest.cc index 1c6a786..448daea 100644 --- a/sync/engine/process_updates_command_unittest.cc +++ b/sync/engine/process_updates_command_unittest.cc @@ -5,9 +5,9 @@ #include "base/basictypes.h" #include "base/memory/ref_counted.h" #include "sync/engine/process_updates_command.h" +#include "sync/internal_api/public/syncable/model_type.h" #include "sync/sessions/session_state.h" #include "sync/sessions/sync_session.h" -#include "sync/syncable/model_type.h" #include "sync/syncable/syncable_id.h" #include "sync/test/engine/fake_model_worker.h" #include "sync/test/engine/syncer_command_test.h" diff --git a/sync/engine/resolve_conflicts_command_unittest.cc b/sync/engine/resolve_conflicts_command_unittest.cc index 079683a..0265317 100644 --- a/sync/engine/resolve_conflicts_command_unittest.cc +++ b/sync/engine/resolve_conflicts_command_unittest.cc @@ -5,8 +5,8 @@ #include "base/basictypes.h" #include "base/memory/ref_counted.h" #include "sync/engine/resolve_conflicts_command.h" +#include "sync/internal_api/public/syncable/model_type.h" #include "sync/sessions/sync_session.h" -#include "sync/syncable/model_type.h" #include "sync/syncable/syncable_id.h" #include "sync/test/engine/fake_model_worker.h" #include "sync/test/engine/syncer_command_test.h" diff --git a/sync/engine/store_timestamps_command.cc b/sync/engine/store_timestamps_command.cc index e35e6c7..e942328 100644 --- a/sync/engine/store_timestamps_command.cc +++ b/sync/engine/store_timestamps_command.cc @@ -4,9 +4,9 @@ #include "sync/engine/store_timestamps_command.h" +#include "sync/internal_api/public/syncable/model_type.h" #include "sync/sessions/status_controller.h" #include "sync/sessions/sync_session.h" -#include "sync/syncable/model_type.h" #include "sync/syncable/syncable.h" namespace browser_sync { diff --git a/sync/engine/sync_engine_event.h b/sync/engine/sync_engine_event.h index 9198ded..e9c52a7 100644 --- a/sync/engine/sync_engine_event.h +++ b/sync/engine/sync_engine_event.h @@ -9,9 +9,7 @@ #include <string> #include "base/observer_list.h" -#include "sync/sessions/session_state.h" -#include "sync/sessions/sync_session_snapshot.h" -#include "sync/syncable/model_type.h" +#include "sync/internal_api/public/sessions/sync_session_snapshot.h" namespace syncable { class Id; diff --git a/sync/engine/sync_scheduler.h b/sync/engine/sync_scheduler.h index dfd63e4..bdf07bc 100644 --- a/sync/engine/sync_scheduler.h +++ b/sync/engine/sync_scheduler.h @@ -20,11 +20,11 @@ #include "base/timer.h" #include "sync/engine/net/server_connection_manager.h" #include "sync/engine/nudge_source.h" -#include "sync/engine/polling_constants.h" #include "sync/engine/syncer.h" +#include "sync/internal_api/public/engine/polling_constants.h" +#include "sync/internal_api/public/syncable/model_type_payload_map.h" #include "sync/sessions/sync_session.h" #include "sync/sessions/sync_session_context.h" -#include "sync/syncable/model_type_payload_map.h" #include "sync/util/weak_handle.h" class MessageLoop; diff --git a/sync/engine/syncer.h b/sync/engine/syncer.h index a5b7fc8..6092f64 100644 --- a/sync/engine/syncer.h +++ b/sync/engine/syncer.h @@ -15,8 +15,8 @@ #include "sync/engine/conflict_resolver.h" #include "sync/engine/syncer_types.h" #include "sync/engine/syncproto.h" +#include "sync/internal_api/public/syncable/model_type.h" #include "sync/sessions/sync_session.h" -#include "sync/syncable/model_type.h" #include "sync/util/extensions_activity_monitor.h" namespace syncable { diff --git a/sync/engine/syncer_command.h b/sync/engine/syncer_command.h index 8095467..949d8fd 100644 --- a/sync/engine/syncer_command.h +++ b/sync/engine/syncer_command.h @@ -8,7 +8,7 @@ #include "base/basictypes.h" -#include "sync/util/syncer_error.h" +#include "sync/internal_api/public/util/syncer_error.h" namespace browser_sync { diff --git a/sync/engine/syncer_proto_util.cc b/sync/engine/syncer_proto_util.cc index 23bdf45..bdadda1 100644 --- a/sync/engine/syncer_proto_util.cc +++ b/sync/engine/syncer_proto_util.cc @@ -10,11 +10,11 @@ #include "sync/engine/syncer.h" #include "sync/engine/syncer_types.h" #include "sync/engine/traffic_logger.h" +#include "sync/internal_api/public/syncable/model_type.h" #include "sync/protocol/sync.pb.h" #include "sync/protocol/sync_enums.pb.h" #include "sync/protocol/sync_protocol_error.h" #include "sync/sessions/sync_session.h" -#include "sync/syncable/model_type.h" #include "sync/syncable/syncable-inl.h" #include "sync/syncable/syncable.h" #include "sync/util/time.h" diff --git a/sync/engine/syncer_proto_util.h b/sync/engine/syncer_proto_util.h index e8086b5..14a3791 100644 --- a/sync/engine/syncer_proto_util.h +++ b/sync/engine/syncer_proto_util.h @@ -10,10 +10,10 @@ #include "base/gtest_prod_util.h" #include "base/time.h" +#include "sync/internal_api/public/syncable/model_type.h" +#include "sync/internal_api/public/util/syncer_error.h" #include "sync/sessions/sync_session.h" #include "sync/syncable/blob.h" -#include "sync/syncable/model_type.h" -#include "sync/util/syncer_error.h" namespace syncable { class Directory; diff --git a/sync/engine/syncer_proto_util_unittest.cc b/sync/engine/syncer_proto_util_unittest.cc index d70a07b..a1431ab 100644 --- a/sync/engine/syncer_proto_util_unittest.cc +++ b/sync/engine/syncer_proto_util_unittest.cc @@ -11,17 +11,17 @@ #include "base/message_loop.h" #include "base/time.h" #include "sync/engine/syncproto.h" +#include "sync/internal_api/public/syncable/model_type_test_util.h" +#include "sync/protocol/bookmark_specifics.pb.h" +#include "sync/protocol/password_specifics.pb.h" +#include "sync/protocol/sync.pb.h" +#include "sync/protocol/sync_enums.pb.h" #include "sync/sessions/session_state.h" #include "sync/sessions/sync_session_context.h" #include "sync/syncable/blob.h" -#include "sync/syncable/model_type_test_util.h" #include "sync/syncable/syncable.h" #include "sync/test/engine/mock_connection_manager.h" #include "sync/test/engine/test_directory_setter_upper.h" -#include "sync/protocol/bookmark_specifics.pb.h" -#include "sync/protocol/password_specifics.pb.h" -#include "sync/protocol/sync.pb.h" -#include "sync/protocol/sync_enums.pb.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/sync/engine/syncer_unittest.cc b/sync/engine/syncer_unittest.cc index 0f698f4..65742eb3 100644 --- a/sync/engine/syncer_unittest.cc +++ b/sync/engine/syncer_unittest.cc @@ -24,22 +24,22 @@ #include "base/time.h" #include "build/build_config.h" #include "sync/engine/get_commit_ids_command.h" -#include "sync/engine/model_safe_worker.h" #include "sync/engine/net/server_connection_manager.h" #include "sync/engine/nigori_util.h" #include "sync/engine/process_updates_command.h" +#include "sync/engine/sync_scheduler.h" #include "sync/engine/syncer.h" #include "sync/engine/syncer_proto_util.h" #include "sync/engine/syncer_util.h" #include "sync/engine/syncproto.h" #include "sync/engine/traffic_recorder.h" -#include "sync/engine/sync_scheduler.h" +#include "sync/internal_api/public/engine/model_safe_worker.h" +#include "sync/internal_api/public/syncable/model_type.h" #include "sync/protocol/bookmark_specifics.pb.h" #include "sync/protocol/nigori_specifics.pb.h" #include "sync/protocol/preference_specifics.pb.h" #include "sync/protocol/sync.pb.h" #include "sync/sessions/sync_session_context.h" -#include "sync/syncable/model_type.h" #include "sync/syncable/syncable.h" #include "sync/test/engine/fake_model_worker.h" #include "sync/test/engine/mock_connection_manager.h" diff --git a/sync/engine/syncer_util.cc b/sync/engine/syncer_util.cc index 710a11b..4f184bd 100644 --- a/sync/engine/syncer_util.cc +++ b/sync/engine/syncer_util.cc @@ -16,11 +16,11 @@ #include "sync/engine/syncer_proto_util.h" #include "sync/engine/syncer_types.h" #include "sync/engine/syncproto.h" +#include "sync/internal_api/public/syncable/model_type.h" #include "sync/protocol/bookmark_specifics.pb.h" #include "sync/protocol/nigori_specifics.pb.h" #include "sync/protocol/password_specifics.pb.h" #include "sync/protocol/sync.pb.h" -#include "sync/syncable/model_type.h" #include "sync/syncable/syncable.h" #include "sync/syncable/syncable_changes_version.h" #include "sync/util/cryptographer.h" diff --git a/sync/engine/syncproto.h b/sync/engine/syncproto.h index 101585f..0f4e21c 100644 --- a/sync/engine/syncproto.h +++ b/sync/engine/syncproto.h @@ -8,8 +8,8 @@ #define SYNC_ENGINE_SYNCPROTO_H_ #pragma once +#include "sync/internal_api/public/syncable/model_type.h" #include "sync/protocol/sync.pb.h" -#include "sync/syncable/model_type.h" #include "sync/syncable/syncable_id.h" namespace browser_sync { diff --git a/sync/engine/update_applicator.h b/sync/engine/update_applicator.h index 024ccfa..0e28180 100644 --- a/sync/engine/update_applicator.h +++ b/sync/engine/update_applicator.h @@ -16,7 +16,7 @@ #include "base/basictypes.h" #include "base/port.h" -#include "sync/engine/model_safe_worker.h" +#include "sync/internal_api/public/engine/model_safe_worker.h" #include "sync/syncable/syncable.h" namespace browser_sync { diff --git a/sync/engine/verify_updates_command.cc b/sync/engine/verify_updates_command.cc index f590b94..0ba0d16 100644 --- a/sync/engine/verify_updates_command.cc +++ b/sync/engine/verify_updates_command.cc @@ -7,12 +7,12 @@ #include <string> #include "base/location.h" -#include "sync/engine/model_safe_worker.h" #include "sync/engine/syncer.h" #include "sync/engine/syncer_proto_util.h" #include "sync/engine/syncer_types.h" #include "sync/engine/syncer_util.h" #include "sync/engine/syncproto.h" +#include "sync/internal_api/public/engine/model_safe_worker.h" #include "sync/protocol/bookmark_specifics.pb.h" #include "sync/syncable/syncable.h" diff --git a/sync/engine/verify_updates_command.h b/sync/engine/verify_updates_command.h index 8ccc471..09376f2 100644 --- a/sync/engine/verify_updates_command.h +++ b/sync/engine/verify_updates_command.h @@ -9,9 +9,9 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "sync/engine/model_changing_syncer_command.h" -#include "sync/engine/model_safe_worker.h" #include "sync/engine/syncer_types.h" #include "sync/engine/syncproto.h" +#include "sync/internal_api/public/engine/model_safe_worker.h" namespace syncable { class WriteTransaction; diff --git a/sync/engine/verify_updates_command_unittest.cc b/sync/engine/verify_updates_command_unittest.cc index 20a6cf6..5f7356e 100644 --- a/sync/engine/verify_updates_command_unittest.cc +++ b/sync/engine/verify_updates_command_unittest.cc @@ -4,13 +4,13 @@ #include "base/location.h" #include "sync/engine/verify_updates_command.h" +#include "sync/protocol/bookmark_specifics.pb.h" #include "sync/sessions/session_state.h" #include "sync/sessions/sync_session.h" #include "sync/syncable/syncable.h" #include "sync/syncable/syncable_id.h" #include "sync/test/engine/fake_model_worker.h" #include "sync/test/engine/syncer_command_test.h" -#include "sync/protocol/bookmark_specifics.pb.h" #include "testing/gtest/include/gtest/gtest.h" namespace browser_sync { diff --git a/sync/internal_api/all_status.cc b/sync/internal_api/all_status.cc index 194f26b..a8a7efd 100644 --- a/sync/internal_api/all_status.cc +++ b/sync/internal_api/all_status.cc @@ -9,8 +9,8 @@ #include "base/logging.h" #include "base/port.h" #include "sync/engine/net/server_connection_manager.h" +#include "sync/internal_api/public/syncable/model_type.h" #include "sync/sessions/session_state.h" -#include "sync/syncable/model_type.h" namespace browser_sync { diff --git a/sync/internal_api/all_status.h b/sync/internal_api/all_status.h index 0f1d5b0..f60b9ea 100644 --- a/sync/internal_api/all_status.h +++ b/sync/internal_api/all_status.h @@ -14,10 +14,10 @@ #include "base/compiler_specific.h" #include "base/synchronization/lock.h" -#include "sync/engine/syncer_types.h" #include "sync/engine/sync_engine_event.h" +#include "sync/engine/syncer_types.h" +#include "sync/internal_api/public/syncable/model_type.h" #include "sync/internal_api/sync_manager.h" -#include "sync/syncable/model_type.h" namespace browser_sync { diff --git a/sync/internal_api/base_node.h b/sync/internal_api/base_node.h index 42c3b80..f59753f 100644 --- a/sync/internal_api/base_node.h +++ b/sync/internal_api/base_node.h @@ -13,8 +13,8 @@ #include "base/gtest_prod_util.h" #include "base/memory/scoped_ptr.h" #include "googleurl/src/gurl.h" +#include "sync/internal_api/public/syncable/model_type.h" #include "sync/protocol/sync.pb.h" -#include "sync/syncable/model_type.h" // Forward declarations of internal class types so that sync API objects // may have opaque pointers to these types. diff --git a/sync/internal_api/change_reorder_buffer.cc b/sync/internal_api/change_reorder_buffer.cc index 7fbada4..b92a590 100644 --- a/sync/internal_api/change_reorder_buffer.cc +++ b/sync/internal_api/change_reorder_buffer.cc @@ -10,8 +10,8 @@ #include <utility> // for pair<> #include <vector> +#include "sync/internal_api/public/syncable/model_type.h" #include "sync/internal_api/read_node.h" -#include "sync/syncable/model_type.h" #include "sync/syncable/syncable.h" using std::numeric_limits; diff --git a/sync/internal_api/debug_info_event_listener.h b/sync/internal_api/debug_info_event_listener.h index 64a90f9..06c420b 100644 --- a/sync/internal_api/debug_info_event_listener.h +++ b/sync/internal_api/debug_info_event_listener.h @@ -9,12 +9,12 @@ #include <string> #include "base/compiler_specific.h" +#include "sync/internal_api/public/sessions/sync_session_snapshot.h" #include "sync/internal_api/sync_manager.h" #include "sync/js/js_backend.h" #include "sync/protocol/sync.pb.h" #include "sync/sessions/debug_info_getter.h" #include "sync/sessions/session_state.h" -#include "sync/sessions/sync_session_snapshot.h" #include "sync/util/weak_handle.h" namespace sync_api { diff --git a/sync/internal_api/js_mutation_event_observer_unittest.cc b/sync/internal_api/js_mutation_event_observer_unittest.cc index 4092b82..1e65f4b 100644 --- a/sync/internal_api/js_mutation_event_observer_unittest.cc +++ b/sync/internal_api/js_mutation_event_observer_unittest.cc @@ -7,9 +7,9 @@ #include "base/basictypes.h" #include "base/message_loop.h" #include "base/values.h" +#include "sync/internal_api/public/syncable/model_type.h" #include "sync/js/js_event_details.h" #include "sync/js/js_test_util.h" -#include "sync/syncable/model_type.h" #include "sync/util/weak_handle.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/sync/internal_api/js_sync_manager_observer.cc b/sync/internal_api/js_sync_manager_observer.cc index 1541680..e392ddf 100644 --- a/sync/internal_api/js_sync_manager_observer.cc +++ b/sync/internal_api/js_sync_manager_observer.cc @@ -11,12 +11,12 @@ #include "base/string_number_conversions.h" #include "base/values.h" #include "sync/internal_api/change_record.h" +#include "sync/internal_api/public/sessions/sync_session_snapshot.h" +#include "sync/internal_api/public/syncable/model_type.h" #include "sync/js/js_arg_list.h" #include "sync/js/js_event_details.h" #include "sync/js/js_event_handler.h" #include "sync/sessions/session_state.h" -#include "sync/sessions/sync_session_snapshot.h" -#include "sync/syncable/model_type.h" namespace browser_sync { diff --git a/sync/internal_api/js_sync_manager_observer_unittest.cc b/sync/internal_api/js_sync_manager_observer_unittest.cc index d796b3c..5b28223 100644 --- a/sync/internal_api/js_sync_manager_observer_unittest.cc +++ b/sync/internal_api/js_sync_manager_observer_unittest.cc @@ -8,12 +8,11 @@ #include "base/location.h" #include "base/message_loop.h" #include "base/values.h" +#include "sync/internal_api/public/sessions/sync_session_snapshot.h" +#include "sync/internal_api/public/syncable/model_type.h" #include "sync/js/js_event_details.h" #include "sync/js/js_test_util.h" #include "sync/protocol/sync_protocol_error.h" -#include "sync/sessions/sync_session_snapshot.h" -#include "sync/syncable/model_type.h" -#include "sync/syncable/model_type_payload_map.h" #include "sync/util/weak_handle.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/sync/internal_api/public/DEPS b/sync/internal_api/public/DEPS new file mode 100644 index 0000000..2a51ace --- /dev/null +++ b/sync/internal_api/public/DEPS @@ -0,0 +1,5 @@ +include_rules = [ + "-sync", + "+sync/internal_api/public", + "+sync/protocol", +] diff --git a/sync/engine/model_safe_worker.cc b/sync/internal_api/public/engine/model_safe_worker.cc index a5aa04f..2718acc 100644 --- a/sync/engine/model_safe_worker.cc +++ b/sync/internal_api/public/engine/model_safe_worker.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/model_safe_worker.h" +#include "sync/internal_api/public/engine/model_safe_worker.h" #include "base/json/json_writer.h" #include "base/memory/scoped_ptr.h" diff --git a/sync/engine/model_safe_worker.h b/sync/internal_api/public/engine/model_safe_worker.h index e3f3964..1a6c371 100644 --- a/sync/engine/model_safe_worker.h +++ b/sync/internal_api/public/engine/model_safe_worker.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_MODEL_SAFE_WORKER_H_ -#define SYNC_ENGINE_MODEL_SAFE_WORKER_H_ +#ifndef SYNC_INTERNAL_API_PUBLIC_ENGINE_MODEL_SAFE_WORKER_H_ +#define SYNC_INTERNAL_API_PUBLIC_ENGINE_MODEL_SAFE_WORKER_H_ #pragma once #include <map> @@ -12,8 +12,8 @@ #include "base/callback.h" #include "base/memory/ref_counted.h" -#include "sync/syncable/model_type.h" -#include "sync/util/syncer_error.h" +#include "sync/internal_api/public/syncable/model_type.h" +#include "sync/internal_api/public/util/syncer_error.h" namespace base { class DictionaryValue; @@ -84,4 +84,4 @@ ModelSafeGroup GetGroupForModelType(const syncable::ModelType type, } // namespace browser_sync -#endif // SYNC_ENGINE_MODEL_SAFE_WORKER_H_ +#endif // SYNC_INTERNAL_API_PUBLIC_ENGINE_MODEL_SAFE_WORKER_H_ diff --git a/sync/engine/model_safe_worker_unittest.cc b/sync/internal_api/public/engine/model_safe_worker_unittest.cc index 741c724..5304c13 100644 --- a/sync/engine/model_safe_worker_unittest.cc +++ b/sync/internal_api/public/engine/model_safe_worker_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/engine/model_safe_worker.h" +#include "sync/internal_api/public/engine/model_safe_worker.h" #include "base/memory/scoped_ptr.h" #include "base/values.h" diff --git a/sync/engine/passive_model_worker.cc b/sync/internal_api/public/engine/passive_model_worker.cc index 0b0d423..26fccc1 100644 --- a/sync/engine/passive_model_worker.cc +++ b/sync/internal_api/public/engine/passive_model_worker.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/passive_model_worker.h" +#include "sync/internal_api/public/engine/passive_model_worker.h" #include "base/message_loop.h" diff --git a/sync/engine/passive_model_worker.h b/sync/internal_api/public/engine/passive_model_worker.h index a8b89f7..7c0ddf3 100644 --- a/sync/engine/passive_model_worker.h +++ b/sync/internal_api/public/engine/passive_model_worker.h @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef SYNC_ENGINE_PASSIVE_MODEL_WORKER_H_ -#define SYNC_ENGINE_PASSIVE_MODEL_WORKER_H_ +#ifndef SYNC_INTERNAL_API_PUBLIC_ENGINE_PASSIVE_MODEL_WORKER_H_ +#define SYNC_INTERNAL_API_PUBLIC_ENGINE_PASSIVE_MODEL_WORKER_H_ #pragma once #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "sync/engine/model_safe_worker.h" -#include "sync/util/syncer_error.h" +#include "sync/internal_api/public/engine/model_safe_worker.h" +#include "sync/internal_api/public/util/syncer_error.h" class MessageLoop; @@ -37,4 +37,4 @@ class PassiveModelWorker : public ModelSafeWorker { } // namespace browser_sync -#endif // SYNC_ENGINE_PASSIVE_MODEL_WORKER_H_ +#endif // SYNC_INTERNAL_API_PUBLIC_ENGINE_PASSIVE_MODEL_WORKER_H_ diff --git a/sync/engine/polling_constants.cc b/sync/internal_api/public/engine/polling_constants.cc index c1f8e37..d7fe753 100644 --- a/sync/engine/polling_constants.cc +++ b/sync/internal_api/public/engine/polling_constants.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/basictypes.h" -#include "sync/engine/polling_constants.h" +#include "sync/internal_api/public/engine/polling_constants.h" namespace browser_sync { diff --git a/sync/engine/polling_constants.h b/sync/internal_api/public/engine/polling_constants.h index ff6650c..9adfe92 100644 --- a/sync/engine/polling_constants.h +++ b/sync/internal_api/public/engine/polling_constants.h @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. // -// Constants used by SyncerThread when polling servers for updates. +// Constants used by SyncScheduler when polling servers for updates. -#ifndef SYNC_ENGINE_POLLING_CONSTANTS_H_ -#define SYNC_ENGINE_POLLING_CONSTANTS_H_ +#ifndef SYNC_INTERNAL_API_PUBLIC_ENGINE_POLLING_CONSTANTS_H_ +#define SYNC_INTERNAL_API_PUBLIC_ENGINE_POLLING_CONSTANTS_H_ #pragma once namespace browser_sync { @@ -17,4 +17,4 @@ extern const int kBackoffRandomizationFactor; } // namespace browser_sync -#endif // SYNC_ENGINE_POLLING_CONSTANTS_H_ +#endif // SYNC_INTERNAL_API_PUBLIC_ENGINE_POLLING_CONSTANTS_H_ diff --git a/sync/sessions/error_counters.cc b/sync/internal_api/public/sessions/error_counters.cc index c227b82..72ed2d1 100644 --- a/sync/sessions/error_counters.cc +++ b/sync/internal_api/public/sessions/error_counters.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/sessions/error_counters.h" +#include "sync/internal_api/public/sessions/error_counters.h" namespace browser_sync { namespace sessions { diff --git a/sync/sessions/error_counters.h b/sync/internal_api/public/sessions/error_counters.h index c2f532f..a2f528c 100644 --- a/sync/sessions/error_counters.h +++ b/sync/internal_api/public/sessions/error_counters.h @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef SYNC_SESSIONS_ERROR_COUNTERS_H_ -#define SYNC_SESSIONS_ERROR_COUNTERS_H_ +#ifndef SYNC_INTERNAL_API_PUBLIC_SESSIONS_ERROR_COUNTERS_H_ +#define SYNC_INTERNAL_API_PUBLIC_SESSIONS_ERROR_COUNTERS_H_ #pragma once #include "base/basictypes.h" +#include "sync/internal_api/public/util/syncer_error.h" #include "sync/protocol/sync_protocol_error.h" -#include "sync/util/syncer_error.h" namespace browser_sync { namespace sessions { @@ -30,4 +30,4 @@ struct ErrorCounters { } // namespace sessions } // namespace browser_sync -#endif // SYNC_SESSIONS_ERROR_COUNTERS_H_ +#endif // SYNC_INTERNAL_API_PUBLIC_SESSIONS_ERROR_COUNTERS_H_ diff --git a/sync/sessions/sync_session_snapshot.cc b/sync/internal_api/public/sessions/sync_session_snapshot.cc index 588b840..d058a4f 100644 --- a/sync/sessions/sync_session_snapshot.cc +++ b/sync/internal_api/public/sessions/sync_session_snapshot.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/sessions/sync_session_snapshot.h" +#include "sync/internal_api/public/sessions/sync_session_snapshot.h" #include "base/json/json_writer.h" #include "base/values.h" diff --git a/sync/sessions/sync_session_snapshot.h b/sync/internal_api/public/sessions/sync_session_snapshot.h index 8da3b80..9ed9465 100644 --- a/sync/sessions/sync_session_snapshot.h +++ b/sync/internal_api/public/sessions/sync_session_snapshot.h @@ -2,19 +2,19 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef SYNC_SESSIONS_SYNC_SESSION_SNAPSHOT_H_ -#define SYNC_SESSIONS_SYNC_SESSION_SNAPSHOT_H_ +#ifndef SYNC_INTERNAL_API_PUBLIC_SESSIONS_SYNC_SESSION_SNAPSHOT_H_ +#define SYNC_INTERNAL_API_PUBLIC_SESSIONS_SYNC_SESSION_SNAPSHOT_H_ #pragma once #include <string> #include "base/basictypes.h" #include "base/time.h" -#include "sync/sessions/error_counters.h" -#include "sync/sessions/sync_source_info.h" -#include "sync/sessions/syncer_status.h" -#include "sync/syncable/model_type.h" -#include "sync/syncable/model_type_payload_map.h" +#include "sync/internal_api/public/sessions/error_counters.h" +#include "sync/internal_api/public/sessions/sync_source_info.h" +#include "sync/internal_api/public/sessions/syncer_status.h" +#include "sync/internal_api/public/syncable/model_type.h" +#include "sync/internal_api/public/syncable/model_type_payload_map.h" namespace base { class DictionaryValue; @@ -98,4 +98,4 @@ class SyncSessionSnapshot { } // namespace sessions } // namespace browser_sync -#endif // SYNC_SESSIONS_SYNC_SESSION_SNAPSHOT_H_ +#endif // SYNC_INTERNAL_API_PUBLIC_SESSIONS_SYNC_SESSION_SNAPSHOT_H_ diff --git a/sync/sessions/sync_source_info.cc b/sync/internal_api/public/sessions/sync_source_info.cc index c6c47ab..191199b 100644 --- a/sync/sessions/sync_source_info.cc +++ b/sync/internal_api/public/sessions/sync_source_info.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/sessions/sync_source_info.h" +#include "sync/internal_api/public/sessions/sync_source_info.h" #include "base/values.h" #include "sync/protocol/proto_enum_conversions.h" diff --git a/sync/sessions/sync_source_info.h b/sync/internal_api/public/sessions/sync_source_info.h index 0eedd40..838e094 100644 --- a/sync/sessions/sync_source_info.h +++ b/sync/internal_api/public/sessions/sync_source_info.h @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef SYNC_SESSIONS_SYNC_SOURCE_INFO_H_ -#define SYNC_SESSIONS_SYNC_SOURCE_INFO_H_ +#ifndef SYNC_INTERNAL_API_PUBLIC_SESSIONS_SYNC_SOURCE_INFO_H_ +#define SYNC_INTERNAL_API_PUBLIC_SESSIONS_SYNC_SOURCE_INFO_H_ #pragma once #include "base/basictypes.h" -#include "sync/engine/syncproto.h" -#include "sync/syncable/model_type.h" -#include "sync/syncable/model_type_payload_map.h" +#include "sync/internal_api/public/syncable/model_type.h" +#include "sync/internal_api/public/syncable/model_type_payload_map.h" +#include "sync/protocol/sync.pb.h" namespace base { class DictionaryValue; @@ -39,4 +39,4 @@ struct SyncSourceInfo { } // namespace sessions } // namespace browser_sync -#endif // SYNC_SESSIONS_SYNC_SOURCE_INFO_H_ +#endif // SYNC_INTERNAL_API_PUBLIC_SESSIONS_SYNC_SOURCE_INFO_H_ diff --git a/sync/sessions/syncer_status.cc b/sync/internal_api/public/sessions/syncer_status.cc index ba318e4..efa0c43 100644 --- a/sync/sessions/syncer_status.cc +++ b/sync/internal_api/public/sessions/syncer_status.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/sessions/syncer_status.h" +#include "sync/internal_api/public/sessions/syncer_status.h" #include "base/values.h" diff --git a/sync/sessions/syncer_status.h b/sync/internal_api/public/sessions/syncer_status.h index b862d1f..7331ca3 100644 --- a/sync/sessions/syncer_status.h +++ b/sync/internal_api/public/sessions/syncer_status.h @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef SYNC_SESSIONS_SYNCER_STATUS_H_ -#define SYNC_SESSIONS_SYNCER_STATUS_H_ +#ifndef SYNC_INTERNAL_API_PUBLIC_SESSIONS_SYNCER_STATUS_H_ +#define SYNC_INTERNAL_API_PUBLIC_SESSIONS_SYNCER_STATUS_H_ #pragma once #include "base/basictypes.h" -#include "sync/syncable/model_type.h" +#include "sync/internal_api/public/syncable/model_type.h" namespace base { class DictionaryValue; @@ -47,4 +47,4 @@ struct SyncerStatus { } // namespace sessions } // namespace browser_sync -#endif // SYNC_SESSIONS_SYNCER_STATUS_H_ +#endif // SYNC_INTERNAL_API_PUBLIC_SESSIONS_SYNCER_STATUS_H_ diff --git a/sync/syncable/model_type.h b/sync/internal_api/public/syncable/model_type.h index 133af9c..b7b5fe3 100644 --- a/sync/syncable/model_type.h +++ b/sync/internal_api/public/syncable/model_type.h @@ -6,8 +6,8 @@ // Each sync object is expected to have an immutable object type. // An object's type is inferred from the type of data it holds. -#ifndef SYNC_SYNCABLE_MODEL_TYPE_H_ -#define SYNC_SYNCABLE_MODEL_TYPE_H_ +#ifndef SYNC_INTERNAL_API_PUBLIC_SYNCABLE_MODEL_TYPE_H_ +#define SYNC_INTERNAL_API_PUBLIC_SYNCABLE_MODEL_TYPE_H_ #pragma once #include <set> @@ -15,7 +15,7 @@ #include "base/logging.h" #include "base/time.h" -#include "sync/util/enum_set.h" +#include "sync/internal_api/public/util/enum_set.h" namespace base { class ListValue; @@ -172,4 +172,4 @@ bool IsRealDataType(ModelType model_type); } // namespace syncable -#endif // SYNC_SYNCABLE_MODEL_TYPE_H_ +#endif // SYNC_INTERNAL_API_PUBLIC_SYNCABLE_MODEL_TYPE_H_ diff --git a/sync/syncable/model_type_payload_map.cc b/sync/internal_api/public/syncable/model_type_payload_map.cc index 1485cec..cff4c92 100644 --- a/sync/syncable/model_type_payload_map.cc +++ b/sync/internal_api/public/syncable/model_type_payload_map.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/syncable/model_type_payload_map.h" +#include "sync/internal_api/public/syncable/model_type_payload_map.h" #include <vector> diff --git a/sync/syncable/model_type_payload_map.h b/sync/internal_api/public/syncable/model_type_payload_map.h index f46f743..1bf3884 100644 --- a/sync/syncable/model_type_payload_map.h +++ b/sync/internal_api/public/syncable/model_type_payload_map.h @@ -4,15 +4,15 @@ // // Definition of ModelTypePayloadMap and various utility functions. -#ifndef SYNC_SYNCABLE_MODEL_TYPE_PAYLOAD_MAP_H_ -#define SYNC_SYNCABLE_MODEL_TYPE_PAYLOAD_MAP_H_ +#ifndef SYNC_INTERNAL_PUBLIC_API_SYNCABLE_MODEL_TYPE_PAYLOAD_MAP_H_ +#define SYNC_INTERNAL_PUBLIC_API_SYNCABLE_MODEL_TYPE_PAYLOAD_MAP_H_ #pragma once #include <map> #include <string> -#include "sync/engine/model_safe_worker.h" -#include "sync/syncable/model_type.h" +#include "sync/internal_api/public/engine/model_safe_worker.h" +#include "sync/internal_api/public/syncable/model_type.h" namespace base { class DictionaryValue; @@ -57,4 +57,4 @@ void PurgeStalePayload(ModelTypePayloadMap* original, } // namespace syncable -#endif // SYNC_SYNCABLE_MODEL_TYPE_PAYLOAD_MAP_H_ +#endif // SYNC_INTERNAL_PUBLIC_API_SYNCABLE_MODEL_TYPE_PAYLOAD_MAP_H_ diff --git a/sync/syncable/model_type_payload_map_unittest.cc b/sync/internal_api/public/syncable/model_type_payload_map_unittest.cc index 212c2b7..4a18b34 100644 --- a/sync/syncable/model_type_payload_map_unittest.cc +++ b/sync/internal_api/public/syncable/model_type_payload_map_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/syncable/model_type_payload_map.h" +#include "sync/internal_api/public/syncable/model_type_payload_map.h" #include <string> diff --git a/sync/syncable/model_type_test_util.cc b/sync/internal_api/public/syncable/model_type_test_util.cc index a3b6742..36d1673 100644 --- a/sync/syncable/model_type_test_util.cc +++ b/sync/internal_api/public/syncable/model_type_test_util.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/syncable/model_type_test_util.h" +#include "sync/internal_api/public/syncable/model_type_test_util.h" namespace syncable { diff --git a/sync/syncable/model_type_test_util.h b/sync/internal_api/public/syncable/model_type_test_util.h index a852a07..173212f 100644 --- a/sync/syncable/model_type_test_util.h +++ b/sync/internal_api/public/syncable/model_type_test_util.h @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef SYNC_SYNCABLE_MODEL_TYPE_TEST_UTIL_H_ -#define SYNC_SYNCABLE_MODEL_TYPE_TEST_UTIL_H_ +#ifndef SYNC_INTERNAL_PUBLIC_API_SYNCABLE_MODEL_TYPE_TEST_UTIL_H_ +#define SYNC_INTERNAL_PUBLIC_API_SYNCABLE_MODEL_TYPE_TEST_UTIL_H_ #pragma once #include <ostream> -#include "sync/syncable/model_type.h" +#include "sync/internal_api/public/syncable/model_type.h" #include "testing/gmock/include/gmock/gmock.h" namespace syncable { @@ -23,4 +23,4 @@ void PrintTo(ModelTypeSet model_types, ::std::ostream* os); } // namespace syncable -#endif // SYNC_SYNCABLE_MODEL_TYPE_TEST_UTIL_H_ +#endif // SYNC_INTERNAL_PUBLIC_API_SYNCABLE_MODEL_TYPE_TEST_UTIL_H_ diff --git a/sync/util/enum_set.h b/sync/internal_api/public/util/enum_set.h index d860623..de270d8 100644 --- a/sync/util/enum_set.h +++ b/sync/internal_api/public/util/enum_set.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_UTIL_ENUM_SET_H_ -#define SYNC_UTIL_ENUM_SET_H_ +#ifndef SYNC_INTERNAL_API_PUBLIC_UTIL_ENUM_SET_H_ +#define SYNC_INTERNAL_API_PUBLIC_UTIL_ENUM_SET_H_ #pragma once #include <bitset> @@ -283,4 +283,4 @@ EnumSet<E, Min, Max> Difference(EnumSet<E, Min, Max> set1, } // namespace browser_sync -#endif // SYNC_UTIL_ENUM_SET_H_ +#endif // SYNC_INTERNAL_API_PUBLIC_UTIL_ENUM_SET_H_ diff --git a/sync/util/enum_set_unittest.cc b/sync/internal_api/public/util/enum_set_unittest.cc index 8c32c0a..2caa1de 100644 --- a/sync/util/enum_set_unittest.cc +++ b/sync/internal_api/public/util/enum_set_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/util/enum_set.h" +#include "sync/internal_api/public/util/enum_set.h" #include "base/basictypes.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/sync/util/syncer_error.cc b/sync/internal_api/public/util/syncer_error.cc index 5f836ce..b4ba578 100644 --- a/sync/util/syncer_error.cc +++ b/sync/internal_api/public/util/syncer_error.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/util/syncer_error.h" +#include "sync/internal_api/public/util/syncer_error.h" #include "base/logging.h" diff --git a/sync/util/syncer_error.h b/sync/internal_api/public/util/syncer_error.h index 6613f59..aa6ebb3 100644 --- a/sync/util/syncer_error.h +++ b/sync/internal_api/public/util/syncer_error.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_INTERNAL_API_INCLUDES_SYNCER_ERROR_H_ -#define SYNC_INTERNAL_API_INCLUDES_SYNCER_ERROR_H_ +#ifndef SYNC_INTERNAL_API_PUBLIC_UTIL_SYNCER_ERROR_H_ +#define SYNC_INTERNAL_API_PUBLIC_UTIL_SYNCER_ERROR_H_ #pragma once namespace browser_sync { @@ -43,4 +43,4 @@ const char * GetSyncerErrorString(SyncerError); } // namespace browser_sync -#endif // SYNC_INTERNAL_API_INCLUDES_SYNCER_ERROR_H_ +#endif // SYNC_INTERNAL_API_PUBLIC_UTIL_SYNCER_ERROR_H_ diff --git a/sync/internal_api/read_node.h b/sync/internal_api/read_node.h index ea48660..98638de 100644 --- a/sync/internal_api/read_node.h +++ b/sync/internal_api/read_node.h @@ -11,7 +11,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "sync/internal_api/base_node.h" -#include "sync/syncable/model_type.h" +#include "sync/internal_api/public/syncable/model_type.h" namespace sync_api { diff --git a/sync/internal_api/sync_manager.cc b/sync/internal_api/sync_manager.cc index 4a5ade2..1e8b7dd 100644 --- a/sync/internal_api/sync_manager.cc +++ b/sync/internal_api/sync_manager.cc @@ -20,7 +20,6 @@ #include "net/base/network_change_notifier.h" #include "sync/engine/net/server_connection_manager.h" #include "sync/engine/nigori_util.h" -#include "sync/engine/polling_constants.h" #include "sync/engine/sync_scheduler.h" #include "sync/engine/syncer_types.h" #include "sync/internal_api/all_status.h" @@ -30,6 +29,9 @@ #include "sync/internal_api/debug_info_event_listener.h" #include "sync/internal_api/js_mutation_event_observer.h" #include "sync/internal_api/js_sync_manager_observer.h" +#include "sync/internal_api/public/engine/polling_constants.h" +#include "sync/internal_api/public/syncable/model_type.h" +#include "sync/internal_api/public/syncable/model_type_payload_map.h" #include "sync/internal_api/read_node.h" #include "sync/internal_api/read_transaction.h" #include "sync/internal_api/syncapi_internal.h" @@ -48,8 +50,6 @@ #include "sync/protocol/proto_value_conversions.h" #include "sync/protocol/sync.pb.h" #include "sync/syncable/directory_change_delegate.h" -#include "sync/syncable/model_type.h" -#include "sync/syncable/model_type_payload_map.h" #include "sync/syncable/syncable.h" #include "sync/util/cryptographer.h" #include "sync/util/experiments.h" diff --git a/sync/internal_api/sync_manager.h b/sync/internal_api/sync_manager.h index 73229ab..80cda3f 100644 --- a/sync/internal_api/sync_manager.h +++ b/sync/internal_api/sync_manager.h @@ -15,11 +15,11 @@ #include "base/task_runner.h" #include "base/threading/thread_checker.h" #include "base/time.h" -#include "sync/engine/model_safe_worker.h" #include "sync/internal_api/change_record.h" #include "sync/internal_api/configure_reason.h" +#include "sync/internal_api/public/engine/model_safe_worker.h" +#include "sync/internal_api/public/syncable/model_type.h" #include "sync/protocol/sync_protocol_error.h" -#include "sync/syncable/model_type.h" #include "sync/util/report_unrecoverable_error_function.h" #include "sync/util/unrecoverable_error_handler.h" #include "sync/util/weak_handle.h" diff --git a/sync/internal_api/syncapi_unittest.cc b/sync/internal_api/syncapi_unittest.cc index 5c70618..e8fa2bd 100644 --- a/sync/internal_api/syncapi_unittest.cc +++ b/sync/internal_api/syncapi_unittest.cc @@ -23,12 +23,13 @@ #include "base/test/values_test_util.h" #include "base/utf_string_conversions.h" #include "base/values.h" -#include "sync/engine/model_safe_worker.h" #include "sync/engine/nigori_util.h" -#include "sync/engine/polling_constants.h" #include "sync/internal_api/change_record.h" #include "sync/internal_api/http_post_provider_factory.h" #include "sync/internal_api/http_post_provider_interface.h" +#include "sync/internal_api/public/engine/model_safe_worker.h" +#include "sync/internal_api/public/engine/polling_constants.h" +#include "sync/internal_api/public/syncable/model_type_test_util.h" #include "sync/internal_api/read_node.h" #include "sync/internal_api/read_transaction.h" #include "sync/internal_api/sync_manager.h" @@ -51,7 +52,6 @@ #include "sync/protocol/proto_value_conversions.h" #include "sync/protocol/sync.pb.h" #include "sync/sessions/sync_session.h" -#include "sync/syncable/model_type_test_util.h" #include "sync/syncable/syncable.h" #include "sync/syncable/syncable_id.h" #include "sync/test/fake_encryptor.h" diff --git a/sync/internal_api/write_node.h b/sync/internal_api/write_node.h index a87a377..d297ac8 100644 --- a/sync/internal_api/write_node.h +++ b/sync/internal_api/write_node.h @@ -12,7 +12,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "sync/internal_api/base_node.h" -#include "sync/syncable/model_type.h" +#include "sync/internal_api/public/syncable/model_type.h" namespace browser_sync { class Cryptographer; diff --git a/sync/notifier/DEPS b/sync/notifier/DEPS index fe689b9..4c55aa9 100644 --- a/sync/notifier/DEPS +++ b/sync/notifier/DEPS @@ -5,8 +5,7 @@ include_rules = [ "+net/url_request/url_request_context.h", "+net/url_request/url_request_test_util.h", - "+sync/syncable/model_type.h", - "+sync/syncable/model_type_payload_map.h", + "+sync/internal_api/public/syncable", "+sync/protocol/service_constants.h", "+sync/util", diff --git a/sync/notifier/chrome_invalidation_client.cc b/sync/notifier/chrome_invalidation_client.cc index 401335c..5ddb56b 100644 --- a/sync/notifier/chrome_invalidation_client.cc +++ b/sync/notifier/chrome_invalidation_client.cc @@ -15,9 +15,9 @@ #include "google/cacheinvalidation/include/types.h" #include "google/cacheinvalidation/v2/types.pb.h" #include "jingle/notifier/listener/push_client.h" +#include "sync/internal_api/public/syncable/model_type.h" #include "sync/notifier/invalidation_util.h" #include "sync/notifier/registration_manager.h" -#include "sync/syncable/model_type.h" namespace { diff --git a/sync/notifier/chrome_invalidation_client.h b/sync/notifier/chrome_invalidation_client.h index 4e6cdaa..acfc001 100644 --- a/sync/notifier/chrome_invalidation_client.h +++ b/sync/notifier/chrome_invalidation_client.h @@ -17,11 +17,11 @@ #include "base/memory/weak_ptr.h" #include "base/threading/non_thread_safe.h" #include "google/cacheinvalidation/include/invalidation-listener.h" +#include "sync/internal_api/public/syncable/model_type.h" +#include "sync/internal_api/public/syncable/model_type_payload_map.h" #include "sync/notifier/chrome_system_resources.h" #include "sync/notifier/invalidation_state_tracker.h" #include "sync/notifier/state_writer.h" -#include "sync/syncable/model_type.h" -#include "sync/syncable/model_type_payload_map.h" #include "sync/util/weak_handle.h" namespace buzz { diff --git a/sync/notifier/chrome_invalidation_client_unittest.cc b/sync/notifier/chrome_invalidation_client_unittest.cc index 4de8ce0..92f697f12 100644 --- a/sync/notifier/chrome_invalidation_client_unittest.cc +++ b/sync/notifier/chrome_invalidation_client_unittest.cc @@ -9,10 +9,10 @@ #include "google/cacheinvalidation/include/types.h" #include "google/cacheinvalidation/v2/types.pb.h" #include "jingle/notifier/listener/fake_push_client.h" +#include "sync/internal_api/public/syncable/model_type.h" +#include "sync/internal_api/public/syncable/model_type_payload_map.h" #include "sync/notifier/chrome_invalidation_client.h" #include "sync/notifier/mock_invalidation_state_tracker.h" -#include "sync/syncable/model_type.h" -#include "sync/syncable/model_type_payload_map.h" #include "sync/util/weak_handle.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/sync/notifier/invalidation_notifier.cc b/sync/notifier/invalidation_notifier.cc index e188adb..6f5c382 100644 --- a/sync/notifier/invalidation_notifier.cc +++ b/sync/notifier/invalidation_notifier.cc @@ -9,8 +9,8 @@ #include "base/metrics/histogram.h" #include "jingle/notifier/listener/push_client.h" #include "net/url_request/url_request_context.h" +#include "sync/internal_api/public/syncable/model_type_payload_map.h" #include "sync/notifier/sync_notifier_observer.h" -#include "sync/syncable/model_type_payload_map.h" #include "talk/xmpp/jid.h" #include "talk/xmpp/xmppclientsettings.h" diff --git a/sync/notifier/invalidation_notifier.h b/sync/notifier/invalidation_notifier.h index aebf833..01108f5 100644 --- a/sync/notifier/invalidation_notifier.h +++ b/sync/notifier/invalidation_notifier.h @@ -20,10 +20,10 @@ #include "base/memory/scoped_ptr.h" #include "base/observer_list.h" #include "base/threading/non_thread_safe.h" +#include "sync/internal_api/public/syncable/model_type.h" #include "sync/notifier/chrome_invalidation_client.h" #include "sync/notifier/invalidation_state_tracker.h" #include "sync/notifier/sync_notifier.h" -#include "sync/syncable/model_type.h" #include "sync/util/weak_handle.h" namespace notifier { diff --git a/sync/notifier/invalidation_notifier_unittest.cc b/sync/notifier/invalidation_notifier_unittest.cc index c5f7132..8219ad8 100644 --- a/sync/notifier/invalidation_notifier_unittest.cc +++ b/sync/notifier/invalidation_notifier_unittest.cc @@ -10,11 +10,11 @@ #include "jingle/notifier/base/notifier_options.h" #include "jingle/notifier/listener/fake_push_client.h" #include "net/url_request/url_request_test_util.h" +#include "sync/internal_api/public/syncable/model_type.h" +#include "sync/internal_api/public/syncable/model_type_payload_map.h" #include "sync/notifier/invalidation_state_tracker.h" #include "sync/notifier/mock_invalidation_state_tracker.h" #include "sync/notifier/mock_sync_notifier_observer.h" -#include "sync/syncable/model_type.h" -#include "sync/syncable/model_type_payload_map.h" #include "sync/util/weak_handle.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/sync/notifier/invalidation_state_tracker.h b/sync/notifier/invalidation_state_tracker.h index bfa27c9..5e46b06 100644 --- a/sync/notifier/invalidation_state_tracker.h +++ b/sync/notifier/invalidation_state_tracker.h @@ -11,7 +11,7 @@ #include <map> #include "base/basictypes.h" -#include "sync/syncable/model_type.h" +#include "sync/internal_api/public/syncable/model_type.h" namespace sync_notifier { diff --git a/sync/notifier/invalidation_util.h b/sync/notifier/invalidation_util.h index 80c032d..220fa44 100644 --- a/sync/notifier/invalidation_util.h +++ b/sync/notifier/invalidation_util.h @@ -11,7 +11,7 @@ #include <string> #include "google/cacheinvalidation/deps/callback.h" -#include "sync/syncable/model_type.h" +#include "sync/internal_api/public/syncable/model_type.h" namespace invalidation { diff --git a/sync/notifier/non_blocking_invalidation_notifier_unittest.cc b/sync/notifier/non_blocking_invalidation_notifier_unittest.cc index af93d17..4ac2504 100644 --- a/sync/notifier/non_blocking_invalidation_notifier_unittest.cc +++ b/sync/notifier/non_blocking_invalidation_notifier_unittest.cc @@ -10,10 +10,10 @@ #include "base/threading/thread.h" #include "jingle/notifier/base/fake_base_task.h" #include "net/url_request/url_request_test_util.h" +#include "sync/internal_api/public/syncable/model_type.h" +#include "sync/internal_api/public/syncable/model_type_payload_map.h" #include "sync/notifier/invalidation_state_tracker.h" #include "sync/notifier/mock_sync_notifier_observer.h" -#include "sync/syncable/model_type.h" -#include "sync/syncable/model_type_payload_map.h" #include "sync/util/weak_handle.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/sync/notifier/p2p_notifier.cc b/sync/notifier/p2p_notifier.cc index 70b35fe..2eae246 100644 --- a/sync/notifier/p2p_notifier.cc +++ b/sync/notifier/p2p_notifier.cc @@ -11,8 +11,8 @@ #include "base/logging.h" #include "base/values.h" #include "jingle/notifier/listener/push_client.h" +#include "sync/internal_api/public/syncable/model_type_payload_map.h" #include "sync/notifier/sync_notifier_observer.h" -#include "sync/syncable/model_type_payload_map.h" namespace sync_notifier { diff --git a/sync/notifier/p2p_notifier.h b/sync/notifier/p2p_notifier.h index f7b882e..341bc8b 100644 --- a/sync/notifier/p2p_notifier.h +++ b/sync/notifier/p2p_notifier.h @@ -17,8 +17,8 @@ #include "base/observer_list.h" #include "base/threading/non_thread_safe.h" #include "jingle/notifier/listener/push_client_observer.h" +#include "sync/internal_api/public/syncable/model_type.h" #include "sync/notifier/sync_notifier.h" -#include "sync/syncable/model_type.h" namespace notifier { class PushClient; diff --git a/sync/notifier/p2p_notifier_unittest.cc b/sync/notifier/p2p_notifier_unittest.cc index fe1a623..28ec600 100644 --- a/sync/notifier/p2p_notifier_unittest.cc +++ b/sync/notifier/p2p_notifier_unittest.cc @@ -7,8 +7,8 @@ #include <cstddef> #include "jingle/notifier/listener/fake_push_client.h" +#include "sync/internal_api/public/syncable/model_type.h" #include "sync/notifier/mock_sync_notifier_observer.h" -#include "sync/syncable/model_type.h" #include "testing/gtest/include/gtest/gtest.h" namespace sync_notifier { diff --git a/sync/notifier/registration_manager.cc b/sync/notifier/registration_manager.cc index de844c5..8e04916 100644 --- a/sync/notifier/registration_manager.cc +++ b/sync/notifier/registration_manager.cc @@ -11,8 +11,8 @@ #include "base/rand_util.h" #include "google/cacheinvalidation/include/invalidation-client.h" #include "google/cacheinvalidation/include/types.h" +#include "sync/internal_api/public/syncable/model_type.h" #include "sync/notifier/invalidation_util.h" -#include "sync/syncable/model_type.h" namespace sync_notifier { diff --git a/sync/notifier/registration_manager.h b/sync/notifier/registration_manager.h index e8639d0..44e7cf3 100644 --- a/sync/notifier/registration_manager.h +++ b/sync/notifier/registration_manager.h @@ -16,7 +16,7 @@ #include "base/threading/non_thread_safe.h" #include "base/time.h" #include "base/timer.h" -#include "sync/syncable/model_type.h" +#include "sync/internal_api/public/syncable/model_type.h" // For invalidation::InvalidationListener::RegistrationState. #include "google/cacheinvalidation/include/invalidation-listener.h" diff --git a/sync/notifier/registration_manager_unittest.cc b/sync/notifier/registration_manager_unittest.cc index 21172f8..2c143ce 100644 --- a/sync/notifier/registration_manager_unittest.cc +++ b/sync/notifier/registration_manager_unittest.cc @@ -13,8 +13,8 @@ #include "base/basictypes.h" #include "base/message_loop.h" #include "google/cacheinvalidation/include/invalidation-client.h" +#include "sync/internal_api/public/syncable/model_type.h" #include "sync/notifier/invalidation_util.h" -#include "sync/syncable/model_type.h" #include "testing/gtest/include/gtest/gtest.h" namespace sync_notifier { diff --git a/sync/notifier/sync_notifier.h b/sync/notifier/sync_notifier.h index a973538..94f5fc2 100644 --- a/sync/notifier/sync_notifier.h +++ b/sync/notifier/sync_notifier.h @@ -11,7 +11,7 @@ #include <string> -#include "sync/syncable/model_type.h" +#include "sync/internal_api/public/syncable/model_type.h" namespace sync_notifier { class SyncNotifierObserver; diff --git a/sync/notifier/sync_notifier_factory_unittest.cc b/sync/notifier/sync_notifier_factory_unittest.cc index f7e16f4..b0f31e9 100644 --- a/sync/notifier/sync_notifier_factory_unittest.cc +++ b/sync/notifier/sync_notifier_factory_unittest.cc @@ -14,11 +14,11 @@ #include "jingle/notifier/base/notification_method.h" #include "jingle/notifier/base/notifier_options.h" #include "net/url_request/url_request_test_util.h" +#include "sync/internal_api/public/syncable/model_type.h" +#include "sync/internal_api/public/syncable/model_type_payload_map.h" #include "sync/notifier/invalidation_state_tracker.h" #include "sync/notifier/mock_sync_notifier_observer.h" #include "sync/notifier/sync_notifier.h" -#include "sync/syncable/model_type.h" -#include "sync/syncable/model_type_payload_map.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/sync/notifier/sync_notifier_observer.h b/sync/notifier/sync_notifier_observer.h index 1130c9e..a6a629f 100644 --- a/sync/notifier/sync_notifier_observer.h +++ b/sync/notifier/sync_notifier_observer.h @@ -8,7 +8,7 @@ #include <string> -#include "sync/syncable/model_type_payload_map.h" +#include "sync/internal_api/public/syncable/model_type_payload_map.h" namespace sync_notifier { diff --git a/sync/protocol/DEPS b/sync/protocol/DEPS index a21ff1a..d60f62f 100644 --- a/sync/protocol/DEPS +++ b/sync/protocol/DEPS @@ -1,3 +1,3 @@ include_rules = [ - "+sync/syncable/model_type.h", + "+sync/internal_api/public/syncable", ] diff --git a/sync/protocol/proto_value_conversions_unittest.cc b/sync/protocol/proto_value_conversions_unittest.cc index 59eb3a8..4c4c6a7 100644 --- a/sync/protocol/proto_value_conversions_unittest.cc +++ b/sync/protocol/proto_value_conversions_unittest.cc @@ -8,6 +8,7 @@ #include "base/memory/scoped_ptr.h" #include "base/values.h" +#include "sync/internal_api/public/syncable/model_type.h" #include "sync/protocol/app_notification_specifics.pb.h" #include "sync/protocol/app_setting_specifics.pb.h" #include "sync/protocol/app_specifics.pb.h" @@ -24,7 +25,6 @@ #include "sync/protocol/sync.pb.h" #include "sync/protocol/theme_specifics.pb.h" #include "sync/protocol/typed_url_specifics.pb.h" -#include "sync/syncable/model_type.h" #include "testing/gtest/include/gtest/gtest.h" namespace browser_sync { diff --git a/sync/protocol/sync_protocol_error.h b/sync/protocol/sync_protocol_error.h index 9ae5317..be43980 100644 --- a/sync/protocol/sync_protocol_error.h +++ b/sync/protocol/sync_protocol_error.h @@ -8,7 +8,7 @@ #include <string> #include "base/values.h" -#include "sync/syncable/model_type.h" +#include "sync/internal_api/public/syncable/model_type.h" namespace browser_sync{ diff --git a/sync/sessions/DEPS b/sync/sessions/DEPS index a320b0d..81c88ab 100644 --- a/sync/sessions/DEPS +++ b/sync/sessions/DEPS @@ -1,5 +1,8 @@ include_rules = [ "+sync/engine", + "+sync/internal_api/public/engine", + "+sync/internal_api/public/sessions", + "+sync/internal_api/public/syncable", "+sync/protocol", "+sync/syncable", "+sync/test", diff --git a/sync/sessions/ordered_commit_set.h b/sync/sessions/ordered_commit_set.h index f8e6938..e29737f 100644 --- a/sync/sessions/ordered_commit_set.h +++ b/sync/sessions/ordered_commit_set.h @@ -10,8 +10,8 @@ #include <set> #include <vector> -#include "sync/engine/model_safe_worker.h" -#include "sync/syncable/model_type.h" +#include "sync/internal_api/public/engine/model_safe_worker.h" +#include "sync/internal_api/public/syncable/model_type.h" #include "sync/syncable/syncable_id.h" namespace browser_sync { diff --git a/sync/sessions/session_state.h b/sync/sessions/session_state.h index 2bd6fe5..ae55acb 100644 --- a/sync/sessions/session_state.h +++ b/sync/sessions/session_state.h @@ -19,9 +19,8 @@ #include "base/basictypes.h" #include "sync/engine/syncer_types.h" #include "sync/engine/syncproto.h" -#include "sync/sessions/error_counters.h" -#include "sync/sessions/syncer_status.h" -#include "sync/syncable/model_type.h" +#include "sync/internal_api/public/sessions/error_counters.h" +#include "sync/internal_api/public/sessions/syncer_status.h" #include "sync/syncable/syncable_id.h" namespace browser_sync { diff --git a/sync/sessions/session_state_unittest.cc b/sync/sessions/session_state_unittest.cc index e6a9d34..a1a0898 100644 --- a/sync/sessions/session_state_unittest.cc +++ b/sync/sessions/session_state_unittest.cc @@ -11,10 +11,10 @@ #include "base/test/values_test_util.h" #include "base/time.h" #include "base/values.h" -#include "sync/sessions/error_counters.h" -#include "sync/sessions/sync_session_snapshot.h" -#include "sync/sessions/sync_source_info.h" -#include "sync/sessions/syncer_status.h" +#include "sync/internal_api/public/sessions/error_counters.h" +#include "sync/internal_api/public/sessions/sync_session_snapshot.h" +#include "sync/internal_api/public/sessions/sync_source_info.h" +#include "sync/internal_api/public/sessions/syncer_status.h" #include "testing/gtest/include/gtest/gtest.h" namespace browser_sync { diff --git a/sync/sessions/status_controller.cc b/sync/sessions/status_controller.cc index a88d93c..8f6c9ee 100644 --- a/sync/sessions/status_controller.cc +++ b/sync/sessions/status_controller.cc @@ -7,8 +7,8 @@ #include <vector> #include "base/basictypes.h" +#include "sync/internal_api/public/syncable/model_type.h" #include "sync/protocol/sync_protocol_error.h" -#include "sync/syncable/model_type.h" namespace browser_sync { namespace sessions { diff --git a/sync/sessions/sync_session.cc b/sync/sessions/sync_session.cc index e219412..ac874d1 100644 --- a/sync/sessions/sync_session.cc +++ b/sync/sessions/sync_session.cc @@ -8,7 +8,7 @@ #include <iterator> #include "base/logging.h" -#include "sync/syncable/model_type.h" +#include "sync/internal_api/public/syncable/model_type.h" #include "sync/syncable/syncable.h" namespace browser_sync { diff --git a/sync/sessions/sync_session.h b/sync/sessions/sync_session.h index 8b15d35..c903be9 100644 --- a/sync/sessions/sync_session.h +++ b/sync/sessions/sync_session.h @@ -24,13 +24,13 @@ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" #include "base/time.h" -#include "sync/engine/model_safe_worker.h" +#include "sync/internal_api/public/engine/model_safe_worker.h" +#include "sync/internal_api/public/sessions/sync_session_snapshot.h" +#include "sync/internal_api/public/syncable/model_type.h" #include "sync/sessions/ordered_commit_set.h" #include "sync/sessions/session_state.h" #include "sync/sessions/status_controller.h" #include "sync/sessions/sync_session_context.h" -#include "sync/sessions/sync_session_snapshot.h" -#include "sync/syncable/model_type.h" #include "sync/util/extensions_activity_monitor.h" namespace syncable { diff --git a/sync/sessions/sync_session_context.h b/sync/sessions/sync_session_context.h index f8de52e..b1fc297 100644 --- a/sync/sessions/sync_session_context.h +++ b/sync/sessions/sync_session_context.h @@ -25,10 +25,10 @@ #include "base/gtest_prod_util.h" #include "base/time.h" -#include "sync/engine/model_safe_worker.h" -#include "sync/engine/syncer_types.h" #include "sync/engine/sync_engine_event.h" +#include "sync/engine/syncer_types.h" #include "sync/engine/traffic_recorder.h" +#include "sync/internal_api/public/engine/model_safe_worker.h" #include "sync/sessions/debug_info_getter.h" namespace syncable { diff --git a/sync/sessions/sync_session_context_unittest.cc b/sync/sessions/sync_session_context_unittest.cc index 0e1fbf3..1b0a11a 100644 --- a/sync/sessions/sync_session_context_unittest.cc +++ b/sync/sessions/sync_session_context_unittest.cc @@ -4,7 +4,7 @@ #include "sync/sessions/sync_session_context.h" -#include "sync/syncable/model_type.h" +#include "sync/internal_api/public/syncable/model_type.h" #include "testing/gtest/include/gtest/gtest.h" namespace browser_sync { diff --git a/sync/sessions/sync_session_unittest.cc b/sync/sessions/sync_session_unittest.cc index 012f33d..8c3bd38 100644 --- a/sync/sessions/sync_session_unittest.cc +++ b/sync/sessions/sync_session_unittest.cc @@ -10,9 +10,9 @@ #include "base/message_loop.h" #include "sync/engine/conflict_resolver.h" #include "sync/engine/syncer_types.h" +#include "sync/internal_api/public/syncable/model_type.h" #include "sync/sessions/session_state.h" #include "sync/sessions/status_controller.h" -#include "sync/syncable/model_type.h" #include "sync/syncable/syncable.h" #include "sync/syncable/syncable_id.h" #include "sync/test/engine/fake_model_worker.h" diff --git a/sync/sync.gyp b/sync/sync.gyp index 780a180..da7dbba 100644 --- a/sync/sync.gyp +++ b/sync/sync.gyp @@ -33,6 +33,26 @@ 'protocol/sync_proto.gyp:sync_proto', ], 'sources': [ + 'internal_api/public/engine/model_safe_worker.cc', + 'internal_api/public/engine/model_safe_worker.h', + 'internal_api/public/engine/passive_model_worker.cc', + 'internal_api/public/engine/passive_model_worker.h', + 'internal_api/public/engine/polling_constants.cc', + 'internal_api/public/engine/polling_constants.h', + 'internal_api/public/sessions/error_counters.cc', + 'internal_api/public/sessions/error_counters.h', + 'internal_api/public/sessions/syncer_status.cc', + 'internal_api/public/sessions/syncer_status.h', + 'internal_api/public/sessions/sync_session_snapshot.cc', + 'internal_api/public/sessions/sync_session_snapshot.h', + 'internal_api/public/sessions/sync_source_info.cc', + 'internal_api/public/sessions/sync_source_info.h', + 'internal_api/public/syncable/model_type.h', + 'internal_api/public/syncable/model_type_payload_map.cc', + 'internal_api/public/syncable/model_type_payload_map.h', + 'internal_api/public/util/enum_set.h', + 'internal_api/public/util/syncer_error.cc', + 'internal_api/public/util/syncer_error.h', 'engine/apply_updates_command.cc', 'engine/apply_updates_command.h', 'engine/build_commit_command.cc', @@ -51,10 +71,6 @@ 'engine/get_commit_ids_command.h', 'engine/model_changing_syncer_command.cc', 'engine/model_changing_syncer_command.h', - 'engine/model_safe_worker.cc', - 'engine/model_safe_worker.h', - 'engine/passive_model_worker.cc', - 'engine/passive_model_worker.h', 'engine/net/server_connection_manager.cc', 'engine/net/server_connection_manager.h', 'engine/net/url_translator.cc', @@ -63,8 +79,6 @@ 'engine/nigori_util.h', 'engine/nudge_source.cc', 'engine/nudge_source.h', - 'engine/polling_constants.cc', - 'engine/polling_constants.h', 'engine/process_commit_response_command.cc', 'engine/process_commit_response_command.h', 'engine/process_updates_command.cc', @@ -112,24 +126,16 @@ 'protocol/sync_protocol_error.cc', 'protocol/sync_protocol_error.h', 'sessions/debug_info_getter.h', - 'sessions/error_counters.cc', - 'sessions/error_counters.h', 'sessions/ordered_commit_set.cc', 'sessions/ordered_commit_set.h', 'sessions/session_state.cc', 'sessions/session_state.h', 'sessions/status_controller.cc', 'sessions/status_controller.h', - 'sessions/syncer_status.cc', - 'sessions/syncer_status.h', 'sessions/sync_session.cc', 'sessions/sync_session.h', 'sessions/sync_session_context.cc', 'sessions/sync_session_context.h', - 'sessions/sync_session_snapshot.cc', - 'sessions/sync_session_snapshot.h', - 'sessions/sync_source_info.cc', - 'sessions/sync_source_info.h', 'syncable/blob.h', 'syncable/directory_backing_store.cc', 'syncable/directory_backing_store.h', @@ -138,9 +144,6 @@ 'syncable/in_memory_directory_backing_store.cc', 'syncable/in_memory_directory_backing_store.h', 'syncable/model_type.cc', - 'syncable/model_type.h', - 'syncable/model_type_payload_map.cc', - 'syncable/model_type_payload_map.h', 'syncable/on_disk_directory_backing_store.cc', 'syncable/on_disk_directory_backing_store.h', 'syncable/syncable.cc', @@ -163,7 +166,6 @@ 'util/data_type_histogram.h', 'util/encryptor.h', - 'util/enum_set.h', 'util/experiments.h', 'util/extensions_activity_monitor.cc', 'util/extensions_activity_monitor.h', @@ -181,8 +183,6 @@ 'util/report_unrecoverable_error_function.h', 'util/session_utils_android.cc', 'util/session_utils_android.h', - 'util/syncer_error.cc', - 'util/syncer_error.h', 'util/time.cc', 'util/time.h', 'util/unrecoverable_error_handler.h', @@ -361,14 +361,14 @@ 'sync', ], 'sources': [ + 'internal_api/public/syncable/model_type_test_util.cc', + 'internal_api/public/syncable/model_type_test_util.h', 'js/js_test_util.cc', 'js/js_test_util.h', 'notifier/mock_invalidation_state_tracker.cc', 'notifier/mock_invalidation_state_tracker.h', 'sessions/test_util.cc', 'sessions/test_util.h', - 'syncable/model_type_test_util.cc', - 'syncable/model_type_test_util.h', 'syncable/syncable_mock.cc', 'syncable/syncable_mock.h', 'test/fake_encryptor.cc', @@ -501,13 +501,15 @@ '..', ], 'sources': [ + 'internal_api/public/engine/model_safe_worker_unittest.cc', + 'internal_api/public/syncable/model_type_payload_map_unittest.cc', + 'internal_api/public/util/enum_set_unittest.cc', 'engine/apply_updates_command_unittest.cc', 'engine/build_commit_command_unittest.cc', 'engine/clear_data_command_unittest.cc', 'engine/cleanup_disabled_types_command_unittest.cc', 'engine/download_updates_command_unittest.cc', 'engine/model_changing_syncer_command_unittest.cc', - 'engine/model_safe_worker_unittest.cc', 'engine/nigori_util_unittest.cc', 'engine/process_commit_response_command_unittest.cc', 'engine/process_updates_command_unittest.cc', @@ -530,7 +532,6 @@ 'sessions/sync_session_context_unittest.cc', 'sessions/sync_session_unittest.cc', 'syncable/directory_backing_store_unittest.cc', - 'syncable/model_type_payload_map_unittest.cc', 'syncable/model_type_unittest.cc', 'syncable/syncable_enum_conversions_unittest.cc', 'syncable/syncable_id_unittest.cc', @@ -538,7 +539,6 @@ 'util/cryptographer_unittest.cc', 'util/data_encryption_win_unittest.cc', 'util/data_type_histogram_unittest.cc', - 'util/enum_set_unittest.cc', 'util/get_session_name_unittest.cc', 'util/immutable_unittest.cc', 'util/nigori_unittest.cc', diff --git a/sync/syncable/DEPS b/sync/syncable/DEPS index cb86572..7b13d73 100644 --- a/sync/syncable/DEPS +++ b/sync/syncable/DEPS @@ -1,13 +1,12 @@ include_rules = [ "+net/base/escape.h", "+sql", + "+sync/internal_api/public/engine", + "+sync/internal_api/public/syncable", "+sync/protocol", "+sync/test", "+sync/util", # this file is weird. "+sync/engine/syncproto.h", - - # maybe this file should live in syncable? - "+sync/engine/model_safe_worker.h", ] diff --git a/sync/syncable/directory_backing_store.h b/sync/syncable/directory_backing_store.h index 4c9bd846..7e86eb9 100644 --- a/sync/syncable/directory_backing_store.h +++ b/sync/syncable/directory_backing_store.h @@ -12,8 +12,8 @@ #include "base/threading/non_thread_safe.h" #include "sql/connection.h" #include "sql/statement.h" +#include "sync/internal_api/public/syncable/model_type.h" #include "sync/syncable/dir_open_result.h" -#include "sync/syncable/model_type.h" #include "sync/syncable/syncable.h" namespace sync_pb { diff --git a/sync/syncable/directory_change_delegate.h b/sync/syncable/directory_change_delegate.h index e3b0f45..a86b770 100644 --- a/sync/syncable/directory_change_delegate.h +++ b/sync/syncable/directory_change_delegate.h @@ -6,7 +6,7 @@ #define SYNC_SYNCABLE_DIRECTORY_CHANGE_DELEGATE_H_ #pragma once -#include "sync/syncable/model_type.h" +#include "sync/internal_api/public/syncable/model_type.h" #include "sync/syncable/syncable.h" namespace syncable { diff --git a/sync/syncable/model_type.cc b/sync/syncable/model_type.cc index 3b53a90..7589e7f 100644 --- a/sync/syncable/model_type.cc +++ b/sync/syncable/model_type.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/syncable/model_type.h" +#include "sync/internal_api/public/syncable/model_type.h" #include "base/string_split.h" #include "base/values.h" diff --git a/sync/syncable/model_type_unittest.cc b/sync/syncable/model_type_unittest.cc index a8925b6..c8a53f7 100644 --- a/sync/syncable/model_type_unittest.cc +++ b/sync/syncable/model_type_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/syncable/model_type.h" +#include "sync/internal_api/public/syncable/model_type.h" #include <string> diff --git a/sync/syncable/syncable.cc b/sync/syncable/syncable.cc index a9c1263..7bf16fc 100644 --- a/sync/syncable/syncable.cc +++ b/sync/syncable/syncable.cc @@ -14,9 +14,9 @@ #include <string> #include "base/basictypes.h" -#include "base/debug/trace_event.h" #include "base/compiler_specific.h" #include "base/debug/trace_event.h" +#include "base/debug/trace_event.h" #include "base/file_util.h" #include "base/hash_tables.h" #include "base/location.h" @@ -29,20 +29,20 @@ #include "base/time.h" #include "base/utf_string_conversions.h" #include "base/values.h" +#include "net/base/escape.h" +#include "sync/internal_api/public/syncable/model_type.h" #include "sync/protocol/proto_value_conversions.h" #include "sync/syncable/directory_backing_store.h" #include "sync/syncable/directory_change_delegate.h" #include "sync/syncable/in_memory_directory_backing_store.h" -#include "sync/syncable/model_type.h" #include "sync/syncable/on_disk_directory_backing_store.h" #include "sync/syncable/syncable-inl.h" #include "sync/syncable/syncable_changes_version.h" #include "sync/syncable/syncable_columns.h" #include "sync/syncable/syncable_enum_conversions.h" #include "sync/syncable/transaction_observer.h" -#include "sync/util/logging.h" #include "sync/util/cryptographer.h" -#include "net/base/escape.h" +#include "sync/util/logging.h" namespace { diff --git a/sync/syncable/syncable.h b/sync/syncable/syncable.h index c9acc2e..16aa0a2 100644 --- a/sync/syncable/syncable.h +++ b/sync/syncable/syncable.h @@ -26,17 +26,17 @@ #include "base/memory/ref_counted.h" #include "base/synchronization/lock.h" #include "base/time.h" +#include "sync/internal_api/public/syncable/model_type.h" +#include "sync/protocol/sync.pb.h" #include "sync/syncable/blob.h" #include "sync/syncable/dir_open_result.h" -#include "sync/syncable/model_type.h" #include "sync/syncable/syncable_id.h" #include "sync/util/cryptographer.h" #include "sync/util/immutable.h" #include "sync/util/report_unrecoverable_error_function.h" -#include "sync/util/unrecoverable_error_handler.h" #include "sync/util/time.h" +#include "sync/util/unrecoverable_error_handler.h" #include "sync/util/weak_handle.h" -#include "sync/protocol/sync.pb.h" namespace base { class DictionaryValue; diff --git a/sync/syncable/transaction_observer.h b/sync/syncable/transaction_observer.h index bcade47..28db7a0 100644 --- a/sync/syncable/transaction_observer.h +++ b/sync/syncable/transaction_observer.h @@ -6,7 +6,7 @@ #define SYNC_SYNCABLE_TRANSACTION_OBSERVER_H_ #pragma once -#include "sync/syncable/model_type.h" +#include "sync/internal_api/public/syncable/model_type.h" #include "sync/syncable/syncable.h" namespace syncable { diff --git a/sync/test/engine/fake_model_worker.h b/sync/test/engine/fake_model_worker.h index 861adc7..72ad59e 100644 --- a/sync/test/engine/fake_model_worker.h +++ b/sync/test/engine/fake_model_worker.h @@ -11,8 +11,8 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/threading/non_thread_safe.h" -#include "sync/engine/model_safe_worker.h" -#include "sync/util/syncer_error.h" +#include "sync/internal_api/public/engine/model_safe_worker.h" +#include "sync/internal_api/public/util/syncer_error.h" namespace browser_sync { diff --git a/sync/test/engine/mock_connection_manager.h b/sync/test/engine/mock_connection_manager.h index 66d9aa9..d979a54 100644 --- a/sync/test/engine/mock_connection_manager.h +++ b/sync/test/engine/mock_connection_manager.h @@ -17,8 +17,8 @@ #include "base/compiler_specific.h" #include "base/memory/scoped_vector.h" #include "sync/engine/net/server_connection_manager.h" -#include "sync/syncable/model_type.h" -#include "sync/syncable/model_type_payload_map.h" +#include "sync/internal_api/public/syncable/model_type.h" +#include "sync/internal_api/public/syncable/model_type_payload_map.h" #include "sync/protocol/sync.pb.h" class MockConnectionManager : public browser_sync::ServerConnectionManager { diff --git a/sync/test/engine/syncer_command_test.h b/sync/test/engine/syncer_command_test.h index 1fe919b..713e68c 100644 --- a/sync/test/engine/syncer_command_test.h +++ b/sync/test/engine/syncer_command_test.h @@ -14,18 +14,18 @@ #include "base/memory/ref_counted.h" #include "base/message_loop.h" #include "sync/engine/model_changing_syncer_command.h" -#include "sync/engine/model_safe_worker.h" #include "sync/engine/traffic_recorder.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/syncable_mock.h" -#include "sync/test/engine/mock_connection_manager.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/test/fake_extensions_activity_monitor.h" -#include "testing/gtest/include/gtest/gtest.h" #include "testing/gmock/include/gmock/gmock.h" +#include "testing/gtest/include/gtest/gtest.h" using ::testing::NiceMock; diff --git a/sync/tools/DEPS b/sync/tools/DEPS index d3ae88f..4c7287a 100644 --- a/sync/tools/DEPS +++ b/sync/tools/DEPS @@ -4,6 +4,5 @@ include_rules = [ "+net/base/host_resolver.h", "+net/url_request/url_request_test_util.h", "+sync/notifier", - "+sync/syncable/model_type.h", - "+sync/syncable/model_type_payload_map.h", + "+sync/internal_api/public/syncable", ] diff --git a/sync/tools/sync_listen_notifications.cc b/sync/tools/sync_listen_notifications.cc index 5e5f97a..52e2efa 100644 --- a/sync/tools/sync_listen_notifications.cc +++ b/sync/tools/sync_listen_notifications.cc @@ -20,12 +20,12 @@ #include "net/base/host_port_pair.h" #include "net/base/host_resolver.h" #include "net/url_request/url_request_test_util.h" +#include "sync/internal_api/public/syncable/model_type.h" +#include "sync/internal_api/public/syncable/model_type_payload_map.h" #include "sync/notifier/invalidation_state_tracker.h" #include "sync/notifier/sync_notifier.h" #include "sync/notifier/sync_notifier_factory.h" #include "sync/notifier/sync_notifier_observer.h" -#include "sync/syncable/model_type.h" -#include "sync/syncable/model_type_payload_map.h" // This is a simple utility that initializes a sync notifier and // listens to any received notifications. diff --git a/sync/util/DEPS b/sync/util/DEPS index f101c9b..a951508 100644 --- a/sync/util/DEPS +++ b/sync/util/DEPS @@ -1,8 +1,7 @@ include_rules = [ "+crypto", + "+sync/internal_api/public/syncable", "+sync/protocol", - "+sync/syncable/model_type.h", - "+sync/syncable/model_type_test_util.h", "+sync/test/fake_encryptor.h", # TODO(kochi): Remove this hack after "Chromebox" hack in get_session_name.cc diff --git a/sync/util/cryptographer.h b/sync/util/cryptographer.h index 12f3412..b711f29 100644 --- a/sync/util/cryptographer.h +++ b/sync/util/cryptographer.h @@ -13,10 +13,10 @@ #include "base/memory/linked_ptr.h" #include "base/memory/scoped_ptr.h" #include "base/observer_list.h" -#include "sync/syncable/model_type.h" -#include "sync/util/nigori.h" +#include "sync/internal_api/public/syncable/model_type.h" #include "sync/protocol/encryption.pb.h" #include "sync/protocol/nigori_specifics.pb.h" +#include "sync/util/nigori.h" namespace browser_sync { diff --git a/sync/util/cryptographer_unittest.cc b/sync/util/cryptographer_unittest.cc index dc38e0f..c999916 100644 --- a/sync/util/cryptographer_unittest.cc +++ b/sync/util/cryptographer_unittest.cc @@ -8,10 +8,10 @@ #include "base/memory/scoped_ptr.h" #include "base/string_util.h" -#include "sync/syncable/model_type_test_util.h" -#include "sync/test/fake_encryptor.h" +#include "sync/internal_api/public/syncable/model_type_test_util.h" #include "sync/protocol/nigori_specifics.pb.h" #include "sync/protocol/password_specifics.pb.h" +#include "sync/test/fake_encryptor.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/sync/util/data_type_histogram.h b/sync/util/data_type_histogram.h index 72ab1b5..869f162 100644 --- a/sync/util/data_type_histogram.h +++ b/sync/util/data_type_histogram.h @@ -8,7 +8,7 @@ #include "base/metrics/histogram.h" #include "base/time.h" -#include "sync/syncable/model_type.h" +#include "sync/internal_api/public/syncable/model_type.h" // For now, this just implements UMA_HISTOGRAM_LONG_TIMES. This can be adjusted // if we feel the min, max, or bucket count amount are not appropriate. diff --git a/sync/util/experiments.h b/sync/util/experiments.h index 21b3437..1439e2b 100644 --- a/sync/util/experiments.h +++ b/sync/util/experiments.h @@ -6,7 +6,7 @@ #define SYNC_UTIL_EXPERIMENTS_ #pragma once -#include "sync/syncable/model_type.h" +#include "sync/internal_api/public/syncable/model_type.h" namespace browser_sync { |