diff options
Diffstat (limited to 'sync')
69 files changed, 171 insertions, 160 deletions
diff --git a/sync/api/sync_data.cc b/sync/api/sync_data.cc index bf2aa0b..a5a1738 100644 --- a/sync/api/sync_data.cc +++ b/sync/api/sync_data.cc @@ -10,7 +10,7 @@ #include "base/memory/scoped_ptr.h" #include "base/string_number_conversions.h" #include "base/values.h" -#include "sync/internal_api/base_node.h" +#include "sync/internal_api/public/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" diff --git a/sync/api/sync_data.h b/sync/api/sync_data.h index 1626f50..d6a51ba 100644 --- a/sync/api/sync_data.h +++ b/sync/api/sync_data.h @@ -12,7 +12,7 @@ #include "base/basictypes.h" #include "sync/internal_api/public/syncable/model_type.h" -#include "sync/util/immutable.h" +#include "sync/internal_api/public/util/immutable.h" namespace sync_pb { class EntitySpecifics; diff --git a/sync/engine/sync_scheduler.h b/sync/engine/sync_scheduler.h index 8ebd2aa..159d759 100644 --- a/sync/engine/sync_scheduler.h +++ b/sync/engine/sync_scheduler.h @@ -23,9 +23,9 @@ #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/internal_api/public/util/weak_handle.h" #include "sync/sessions/sync_session.h" #include "sync/sessions/sync_session_context.h" -#include "sync/util/weak_handle.h" class MessageLoop; diff --git a/sync/internal_api/base_node.cc b/sync/internal_api/base_node.cc index 99f1614..cfcddcd 100644 --- a/sync/internal_api/base_node.cc +++ b/sync/internal_api/base_node.cc @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "sync/internal_api/base_node.h" +#include "sync/internal_api/public/base_node.h" #include "base/base64.h" #include "base/sha1.h" #include "base/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "base/values.h" -#include "sync/internal_api/base_transaction.h" +#include "sync/internal_api/public/base_transaction.h" #include "sync/internal_api/syncapi_internal.h" #include "sync/protocol/app_specifics.pb.h" #include "sync/protocol/autofill_specifics.pb.h" diff --git a/sync/internal_api/base_transaction.cc b/sync/internal_api/base_transaction.cc index 879e4e3..5fedc64 100644 --- a/sync/internal_api/base_transaction.cc +++ b/sync/internal_api/base_transaction.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "sync/internal_api/base_transaction.h" +#include "sync/internal_api/public/base_transaction.h" #include "sync/syncable/syncable.h" #include "sync/util/cryptographer.h" diff --git a/sync/internal_api/change_record.cc b/sync/internal_api/change_record.cc index 3eefb74..75a57a5 100644 --- a/sync/internal_api/change_record.cc +++ b/sync/internal_api/change_record.cc @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "sync/internal_api/change_record.h" +#include "sync/internal_api/public/change_record.h" #include "base/string_number_conversions.h" #include "base/values.h" -#include "sync/internal_api/base_node.h" -#include "sync/internal_api/read_node.h" +#include "sync/internal_api/public/base_node.h" +#include "sync/internal_api/public/read_node.h" #include "sync/protocol/proto_value_conversions.h" namespace sync_api { diff --git a/sync/internal_api/change_reorder_buffer.cc b/sync/internal_api/change_reorder_buffer.cc index b92a590..34e44f6 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/read_node.h" #include "sync/internal_api/public/syncable/model_type.h" -#include "sync/internal_api/read_node.h" #include "sync/syncable/syncable.h" using std::numeric_limits; diff --git a/sync/internal_api/change_reorder_buffer.h b/sync/internal_api/change_reorder_buffer.h index edb59f3..a6f37a0 100644 --- a/sync/internal_api/change_reorder_buffer.h +++ b/sync/internal_api/change_reorder_buffer.h @@ -15,8 +15,8 @@ #include "base/compiler_specific.h" #include "base/memory/linked_ptr.h" -#include "sync/internal_api/base_transaction.h" -#include "sync/internal_api/change_record.h" +#include "sync/internal_api/public/base_transaction.h" +#include "sync/internal_api/public/change_record.h" #include "sync/protocol/sync.pb.h" namespace sync_api { diff --git a/sync/internal_api/debug_info_event_listener.h b/sync/internal_api/debug_info_event_listener.h index 06c420b..d18f008 100644 --- a/sync/internal_api/debug_info_event_listener.h +++ b/sync/internal_api/debug_info_event_listener.h @@ -10,12 +10,12 @@ #include "base/compiler_specific.h" #include "sync/internal_api/public/sessions/sync_session_snapshot.h" -#include "sync/internal_api/sync_manager.h" +#include "sync/internal_api/public/sync_manager.h" +#include "sync/internal_api/public/util/weak_handle.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/util/weak_handle.h" namespace sync_api { diff --git a/sync/internal_api/js_mutation_event_observer.h b/sync/internal_api/js_mutation_event_observer.h index 3022fa0..6e70c19 100644 --- a/sync/internal_api/js_mutation_event_observer.h +++ b/sync/internal_api/js_mutation_event_observer.h @@ -12,9 +12,9 @@ #include "base/compiler_specific.h" #include "base/memory/weak_ptr.h" #include "base/threading/non_thread_safe.h" -#include "sync/internal_api/sync_manager.h" +#include "sync/internal_api/public/sync_manager.h" +#include "sync/internal_api/public/util/weak_handle.h" #include "sync/syncable/transaction_observer.h" -#include "sync/util/weak_handle.h" namespace tracked_objects { class Location; diff --git a/sync/internal_api/js_mutation_event_observer_unittest.cc b/sync/internal_api/js_mutation_event_observer_unittest.cc index 1e65f4b..8d0e30f 100644 --- a/sync/internal_api/js_mutation_event_observer_unittest.cc +++ b/sync/internal_api/js_mutation_event_observer_unittest.cc @@ -8,9 +8,9 @@ #include "base/message_loop.h" #include "base/values.h" #include "sync/internal_api/public/syncable/model_type.h" +#include "sync/internal_api/public/util/weak_handle.h" #include "sync/js/js_event_details.h" #include "sync/js/js_test_util.h" -#include "sync/util/weak_handle.h" #include "testing/gtest/include/gtest/gtest.h" namespace browser_sync { diff --git a/sync/internal_api/js_sync_manager_observer.cc b/sync/internal_api/js_sync_manager_observer.cc index e392ddf..ae1449e 100644 --- a/sync/internal_api/js_sync_manager_observer.cc +++ b/sync/internal_api/js_sync_manager_observer.cc @@ -10,7 +10,7 @@ #include "base/logging.h" #include "base/string_number_conversions.h" #include "base/values.h" -#include "sync/internal_api/change_record.h" +#include "sync/internal_api/public/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" diff --git a/sync/internal_api/js_sync_manager_observer.h b/sync/internal_api/js_sync_manager_observer.h index 02e2e5b..b410eb9 100644 --- a/sync/internal_api/js_sync_manager_observer.h +++ b/sync/internal_api/js_sync_manager_observer.h @@ -10,9 +10,9 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "sync/internal_api/sync_manager.h" +#include "sync/internal_api/public/sync_manager.h" +#include "sync/internal_api/public/util/weak_handle.h" #include "sync/protocol/sync_protocol_error.h" -#include "sync/util/weak_handle.h" namespace tracked_objects { class Location; diff --git a/sync/internal_api/js_sync_manager_observer_unittest.cc b/sync/internal_api/js_sync_manager_observer_unittest.cc index 5b28223..03404ed 100644 --- a/sync/internal_api/js_sync_manager_observer_unittest.cc +++ b/sync/internal_api/js_sync_manager_observer_unittest.cc @@ -10,10 +10,10 @@ #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/internal_api/public/util/weak_handle.h" #include "sync/js/js_event_details.h" #include "sync/js/js_test_util.h" #include "sync/protocol/sync_protocol_error.h" -#include "sync/util/weak_handle.h" #include "testing/gtest/include/gtest/gtest.h" namespace browser_sync { diff --git a/sync/internal_api/public/DEPS b/sync/internal_api/public/DEPS index 2a51ace..a483090 100644 --- a/sync/internal_api/public/DEPS +++ b/sync/internal_api/public/DEPS @@ -2,4 +2,7 @@ include_rules = [ "-sync", "+sync/internal_api/public", "+sync/protocol", + + # TODO(tim): Remove. Bug 131130 + "+sync/util/cryptographer.h" ] diff --git a/sync/internal_api/base_node.h b/sync/internal_api/public/base_node.h index f59753f..87de41e 100644 --- a/sync/internal_api/base_node.h +++ b/sync/internal_api/public/base_node.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_BASE_NODE_H_ -#define SYNC_INTERNAL_API_BASE_NODE_H_ +#ifndef SYNC_INTERNAL_API_PUBLIC_BASE_NODE_H_ +#define SYNC_INTERNAL_API_PUBLIC_BASE_NODE_H_ #pragma once #include <string> @@ -252,4 +252,4 @@ class BaseNode { } // namespace sync_api -#endif // SYNC_INTERNAL_API_BASE_NODE_H_ +#endif // SYNC_INTERNAL_API_PUBLIC_BASE_NODE_H_ diff --git a/sync/internal_api/base_transaction.h b/sync/internal_api/public/base_transaction.h index f39bca6..77e102a 100644 --- a/sync/internal_api/base_transaction.h +++ b/sync/internal_api/public/base_transaction.h @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef SYNC_INTERNAL_API_BASE_TRANSACTION_H_ -#define SYNC_INTERNAL_API_BASE_TRANSACTION_H_ +#ifndef SYNC_INTERNAL_API_PUBLIC_BASE_TRANSACTION_H_ +#define SYNC_INTERNAL_API_PUBLIC_BASE_TRANSACTION_H_ #pragma once -#include "sync/internal_api/user_share.h" +#include "sync/internal_api/public/user_share.h" #include "sync/util/cryptographer.h" @@ -51,4 +51,4 @@ syncable::ModelTypeSet GetEncryptedTypes( } // namespace sync_api -#endif // SYNC_INTERNAL_API_BASE_TRANSACTION_H_ +#endif // SYNC_INTERNAL_API_PUBLIC_BASE_TRANSACTION_H_ diff --git a/sync/internal_api/change_record.h b/sync/internal_api/public/change_record.h index 3d2f4ee..f522a3b 100644 --- a/sync/internal_api/change_record.h +++ b/sync/internal_api/public/change_record.h @@ -2,16 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef SYNC_INTERNAL_API_CHANGE_RECORD_H_ -#define SYNC_INTERNAL_API_CHANGE_RECORD_H_ +#ifndef SYNC_INTERNAL_PUBLIC_API_CHANGE_RECORD_H_ +#define SYNC_INTERNAL_PUBLIC_API_CHANGE_RECORD_H_ #include <vector> #include "base/basictypes.h" #include "base/memory/linked_ptr.h" +#include "sync/internal_api/public/util/immutable.h" #include "sync/protocol/password_specifics.pb.h" #include "sync/protocol/sync.pb.h" -#include "sync/util/immutable.h" namespace base { class DictionaryValue; @@ -64,4 +64,4 @@ typedef browser_sync::Immutable<ChangeRecordList> ImmutableChangeRecordList; } // namespace sync_api -#endif // SYNC_INTERNAL_API_CHANGE_RECORD_H_ +#endif // SYNC_INTERNAL_API_PUBLIC_CHANGE_RECORD_H_ diff --git a/sync/internal_api/change_record_unittest.cc b/sync/internal_api/public/change_record_unittest.cc index 9a1d1d3..4fb1f01 100644 --- a/sync/internal_api/change_record_unittest.cc +++ b/sync/internal_api/public/change_record_unittest.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "sync/internal_api/change_record.h" +#include "sync/internal_api/public/change_record.h" #include "base/memory/scoped_ptr.h" #include "base/string_number_conversions.h" diff --git a/sync/internal_api/configure_reason.h b/sync/internal_api/public/configure_reason.h index 6008f5f..37916ac 100644 --- a/sync/internal_api/configure_reason.h +++ b/sync/internal_api/public/configure_reason.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_CONFIGURE_REASON_H_ -#define SYNC_INTERNAL_API_CONFIGURE_REASON_H_ +#ifndef SYNC_INTERNAL_API_PUBLIC_CONFIGURE_REASON_H_ +#define SYNC_INTERNAL_API_PUBLIC_CONFIGURE_REASON_H_ #pragma once namespace sync_api { @@ -33,4 +33,4 @@ enum ConfigureReason { } // namespace sync_api -#endif // SYNC_INTERNAL_API_CONFIGURE_REASON_H_ +#endif // SYNC_INTERNAL_API_PUBLIC_CONFIGURE_REASON_H_ diff --git a/sync/internal_api/http_post_provider_factory.h b/sync/internal_api/public/http_post_provider_factory.h index 445fd6a..53d576b 100644 --- a/sync/internal_api/http_post_provider_factory.h +++ b/sync/internal_api/public/http_post_provider_factory.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_HTTP_POST_PROVIDER_FACTORY_H_ -#define SYNC_INTERNAL_API_HTTP_POST_PROVIDER_FACTORY_H_ +#ifndef SYNC_INTERNAL_API_PUBLIC_HTTP_POST_PROVIDER_FACTORY_H_ +#define SYNC_INTERNAL_API_PUBLIC_HTTP_POST_PROVIDER_FACTORY_H_ #pragma once namespace sync_api { @@ -31,4 +31,4 @@ class HttpPostProviderFactory { } // namespace sync_api -#endif // SYNC_INTERNAL_API_HTTP_POST_PROVIDER_FACTORY_H_ +#endif // SYNC_INTERNAL_API_PUBLIC_HTTP_POST_PROVIDER_FACTORY_H_ diff --git a/sync/internal_api/http_post_provider_interface.h b/sync/internal_api/public/http_post_provider_interface.h index df31b7f..5aa201a 100644 --- a/sync/internal_api/http_post_provider_interface.h +++ b/sync/internal_api/public/http_post_provider_interface.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_HTTP_POST_PROVIDER_INTERFACE_H_ -#define SYNC_INTERNAL_API_HTTP_POST_PROVIDER_INTERFACE_H_ +#ifndef SYNC_INTERNAL_API_PUBLIC_HTTP_POST_PROVIDER_INTERFACE_H_ +#define SYNC_INTERNAL_API_PUBLIC_HTTP_POST_PROVIDER_INTERFACE_H_ #pragma once #include <string> @@ -64,4 +64,4 @@ class HttpPostProviderInterface { } // namespace sync_api -#endif // SYNC_INTERNAL_API_HTTP_POST_PROVIDER_INTERFACE_H_ +#endif // SYNC_INTERNAL_API_PUBLIC_HTTP_POST_PROVIDER_INTERFACE_H_ diff --git a/sync/internal_api/read_node.h b/sync/internal_api/public/read_node.h index 98638de..f57b577 100644 --- a/sync/internal_api/read_node.h +++ b/sync/internal_api/public/read_node.h @@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef SYNC_INTERNAL_API_READ_NODE_H_ -#define SYNC_INTERNAL_API_READ_NODE_H_ +#ifndef SYNC_INTERNAL_API_PUBLIC_READ_NODE_H_ +#define SYNC_INTERNAL_API_PUBLIC_READ_NODE_H_ #pragma once #include <string> #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "sync/internal_api/base_node.h" +#include "sync/internal_api/public/base_node.h" #include "sync/internal_api/public/syncable/model_type.h" namespace sync_api { @@ -63,4 +63,4 @@ class ReadNode : public BaseNode { } // namespace sync_api -#endif // SYNC_INTERNAL_API_READ_NODE_H_ +#endif // SYNC_INTERNAL_API_PUBLIC_READ_NODE_H_ diff --git a/sync/internal_api/read_transaction.h b/sync/internal_api/public/read_transaction.h index e45acc6..fd35373 100644 --- a/sync/internal_api/read_transaction.h +++ b/sync/internal_api/public/read_transaction.h @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef SYNC_INTERNAL_API_READ_TRANSACTION_H_ -#define SYNC_INTERNAL_API_READ_TRANSACTION_H_ +#ifndef SYNC_INTERNAL_API_PUBLIC_READ_TRANSACTION_H_ +#define SYNC_INTERNAL_API_PUBLIC_READ_TRANSACTION_H_ #include "base/compiler_specific.h" -#include "sync/internal_api/base_transaction.h" +#include "sync/internal_api/public/base_transaction.h" namespace tracked_objects { class Location; @@ -43,4 +43,4 @@ class ReadTransaction : public BaseTransaction { } // namespace sync_api -#endif // SYNC_INTERNAL_API_READ_TRANSACTION_H_ +#endif // SYNC_INTERNAL_API_PUBLIC_READ_TRANSACTION_H_ diff --git a/sync/internal_api/sync_manager.h b/sync/internal_api/public/sync_manager.h index 04181fe..f4a42e3 100644 --- a/sync/internal_api/sync_manager.h +++ b/sync/internal_api/public/sync_manager.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_SYNC_MANAGER_H_ -#define SYNC_INTERNAL_API_SYNC_MANAGER_H_ +#ifndef SYNC_INTERNAL_API_PUBLIC_SYNC_MANAGER_H_ +#define SYNC_INTERNAL_API_PUBLIC_SYNC_MANAGER_H_ #include <string> #include <vector> @@ -15,15 +15,15 @@ #include "base/task_runner.h" #include "base/threading/thread_checker.h" #include "base/time.h" -#include "sync/internal_api/change_record.h" -#include "sync/internal_api/configure_reason.h" +#include "sync/internal_api/public/change_record.h" +#include "sync/internal_api/public/configure_reason.h" #include "sync/internal_api/public/engine/model_safe_worker.h" #include "sync/internal_api/public/engine/sync_status.h" #include "sync/internal_api/public/syncable/model_type.h" +#include "sync/internal_api/public/util/report_unrecoverable_error_function.h" +#include "sync/internal_api/public/util/unrecoverable_error_handler.h" +#include "sync/internal_api/public/util/weak_handle.h" #include "sync/protocol/sync_protocol_error.h" -#include "sync/util/report_unrecoverable_error_function.h" -#include "sync/util/unrecoverable_error_handler.h" -#include "sync/util/weak_handle.h" namespace browser_sync { struct ConfigurationParams; @@ -577,4 +577,4 @@ const char* PassphraseRequiredReasonToString(PassphraseRequiredReason reason); } // namespace sync_api -#endif // SYNC_INTERNAL_API_SYNC_MANAGER_H_ +#endif // SYNC_INTERNAL_API_PUBLIC_SYNC_MANAGER_H_ diff --git a/sync/internal_api/test_user_share.h b/sync/internal_api/public/test/test_user_share.h index b212e3c..7386b18 100644 --- a/sync/internal_api/test_user_share.h +++ b/sync/internal_api/public/test/test_user_share.h @@ -27,16 +27,17 @@ // } // -#ifndef SYNC_INTERNAL_API_TEST_USER_SHARE_H_ -#define SYNC_INTERNAL_API_TEST_USER_SHARE_H_ +#ifndef SYNC_INTERNAL_API_PUBLIC_TEST_TEST_USER_SHARE_H_ +#define SYNC_INTERNAL_API_PUBLIC_TEST_TEST_USER_SHARE_H_ #pragma once #include "base/basictypes.h" -#include "sync/internal_api/user_share.h" -#include "sync/test/engine/test_directory_setter_upper.h" +#include "sync/internal_api/public/user_share.h" namespace browser_sync { +class TestDirectorySetterUpper; + class TestUserShare { public: TestUserShare(); @@ -56,7 +57,7 @@ class TestUserShare { sync_api::UserShare* user_share(); private: - TestDirectorySetterUpper dir_maker_; + scoped_ptr<TestDirectorySetterUpper> dir_maker_; scoped_ptr<sync_api::UserShare> user_share_; DISALLOW_COPY_AND_ASSIGN(TestUserShare); @@ -64,4 +65,4 @@ class TestUserShare { } // namespace browser_sync -#endif // SYNC_INTERNAL_API_TEST_USER_SHARE_H_ +#endif // SYNC_INTERNAL_API_PUBLIC_TEST_TEST_USER_SHARE_H_ diff --git a/sync/internal_api/user_share.h b/sync/internal_api/public/user_share.h index 275fa42..0fa6a1d 100644 --- a/sync/internal_api/user_share.h +++ b/sync/internal_api/public/user_share.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_USER_SHARE_H_ -#define SYNC_INTERNAL_API_USER_SHARE_H_ +#ifndef SYNC_INTERNAL_API_PUBLIC_USER_SHARE_H_ +#define SYNC_INTERNAL_API_PUBLIC_USER_SHARE_H_ #pragma once #include <string> @@ -33,4 +33,4 @@ struct UserShare { } -#endif // SYNC_INTERNAL_API_USER_SHARE_H_ +#endif // SYNC_INTERNAL_API_PUBLIC_USER_SHARE_H_ diff --git a/sync/util/experiments.h b/sync/internal_api/public/util/experiments.h index 1439e2b..1439e2b 100644 --- a/sync/util/experiments.h +++ b/sync/internal_api/public/util/experiments.h diff --git a/sync/util/immutable.h b/sync/internal_api/public/util/immutable.h index 6624b90..6624b90 100644 --- a/sync/util/immutable.h +++ b/sync/internal_api/public/util/immutable.h diff --git a/sync/util/immutable_unittest.cc b/sync/internal_api/public/util/immutable_unittest.cc index 93211cc..ea0b29b 100644 --- a/sync/util/immutable_unittest.cc +++ b/sync/internal_api/public/util/immutable_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/immutable.h" +#include "sync/internal_api/public/util/immutable.h" #include <algorithm> #include <cstddef> diff --git a/sync/util/report_unrecoverable_error_function.h b/sync/internal_api/public/util/report_unrecoverable_error_function.h index ead73f0..ead73f0 100644 --- a/sync/util/report_unrecoverable_error_function.h +++ b/sync/internal_api/public/util/report_unrecoverable_error_function.h diff --git a/sync/util/unrecoverable_error_handler.h b/sync/internal_api/public/util/unrecoverable_error_handler.h index aaca1e9..aaca1e9 100644 --- a/sync/util/unrecoverable_error_handler.h +++ b/sync/internal_api/public/util/unrecoverable_error_handler.h diff --git a/sync/util/unrecoverable_error_info.cc b/sync/internal_api/public/util/unrecoverable_error_info.cc index 617f1a5..369fa3e 100644 --- a/sync/util/unrecoverable_error_info.cc +++ b/sync/internal_api/public/util/unrecoverable_error_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/util/unrecoverable_error_info.h" +#include "sync/internal_api/public/util/unrecoverable_error_info.h" namespace browser_sync { diff --git a/sync/util/unrecoverable_error_info.h b/sync/internal_api/public/util/unrecoverable_error_info.h index 64b780a..64b780a 100644 --- a/sync/util/unrecoverable_error_info.h +++ b/sync/internal_api/public/util/unrecoverable_error_info.h diff --git a/sync/util/weak_handle.cc b/sync/internal_api/public/util/weak_handle.cc index bdf580b7..136fc58 100644 --- a/sync/util/weak_handle.cc +++ b/sync/internal_api/public/util/weak_handle.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/weak_handle.h" +#include "sync/internal_api/public/util/weak_handle.h" #include <sstream> diff --git a/sync/util/weak_handle.h b/sync/internal_api/public/util/weak_handle.h index 653da60..653da60 100644 --- a/sync/util/weak_handle.h +++ b/sync/internal_api/public/util/weak_handle.h diff --git a/sync/util/weak_handle_unittest.cc b/sync/internal_api/public/util/weak_handle_unittest.cc index 6767df1..af919ad 100644 --- a/sync/util/weak_handle_unittest.cc +++ b/sync/internal_api/public/util/weak_handle_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/weak_handle.h" +#include "sync/internal_api/public/util/weak_handle.h" #include "base/bind.h" #include "base/compiler_specific.h" diff --git a/sync/internal_api/write_node.h b/sync/internal_api/public/write_node.h index d297ac8..ba61122 100644 --- a/sync/internal_api/write_node.h +++ b/sync/internal_api/public/write_node.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_WRITE_NODE_H_ -#define SYNC_INTERNAL_API_WRITE_NODE_H_ +#ifndef SYNC_INTERNAL_API_PUBLIC_WRITE_NODE_H_ +#define SYNC_INTERNAL_API_PUBLIC_WRITE_NODE_H_ #pragma once #include <string> @@ -11,7 +11,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "sync/internal_api/base_node.h" +#include "sync/internal_api/public/base_node.h" #include "sync/internal_api/public/syncable/model_type.h" namespace browser_sync { @@ -200,4 +200,4 @@ class WriteNode : public BaseNode { } // namespace sync_api -#endif // SYNC_INTERNAL_API_WRITE_NODE_H_ +#endif // SYNC_INTERNAL_API_PUBLIC_WRITE_NODE_H_ diff --git a/sync/internal_api/write_transaction.h b/sync/internal_api/public/write_transaction.h index 4364cdd1..1321ed1 100644 --- a/sync/internal_api/write_transaction.h +++ b/sync/internal_api/public/write_transaction.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_INTERNAL_API_WRITE_TRANSACTION_H_ -#define SYNC_INTERNAL_API_WRITE_TRANSACTION_H_ +#ifndef SYNC_INTERNAL_API_PUBLIC_WRITE_TRANSACTION_H_ +#define SYNC_INTERNAL_API_PUBLIC_WRITE_TRANSACTION_H_ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "sync/internal_api/base_transaction.h" +#include "sync/internal_api/public/base_transaction.h" namespace syncable { class BaseTransaction; @@ -54,4 +54,4 @@ class WriteTransaction : public BaseTransaction { } // namespace sync_api -#endif // SYNC_INTERNAL_API_WRITE_TRANSACTION_H_ +#endif // SYNC_INTERNAL_API_PUBLIC_WRITE_TRANSACTION_H_ diff --git a/sync/internal_api/read_node.cc b/sync/internal_api/read_node.cc index 00ee6bc..970f981 100644 --- a/sync/internal_api/read_node.cc +++ b/sync/internal_api/read_node.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "sync/internal_api/read_node.h" +#include "sync/internal_api/public/read_node.h" #include "base/logging.h" -#include "sync/internal_api/base_transaction.h" +#include "sync/internal_api/public/base_transaction.h" #include "sync/syncable/syncable.h" namespace sync_api { diff --git a/sync/internal_api/read_transaction.cc b/sync/internal_api/read_transaction.cc index 5c38f6c..1af6c21 100644 --- a/sync/internal_api/read_transaction.cc +++ b/sync/internal_api/read_transaction.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "sync/internal_api/read_transaction.h" +#include "sync/internal_api/public/read_transaction.h" #include "sync/syncable/syncable.h" diff --git a/sync/internal_api/sync_manager.cc b/sync/internal_api/sync_manager.cc index 13b313e..e9d3434 100644 --- a/sync/internal_api/sync_manager.cc +++ b/sync/internal_api/sync_manager.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "sync/internal_api/sync_manager.h" +#include "sync/internal_api/public/sync_manager.h" #include <string> @@ -25,22 +25,23 @@ #include "sync/engine/sync_scheduler.h" #include "sync/engine/syncer_types.h" #include "sync/engine/throttled_data_type_tracker.h" -#include "sync/internal_api/base_node.h" #include "sync/internal_api/change_reorder_buffer.h" -#include "sync/internal_api/configure_reason.h" #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/base_node.h" +#include "sync/internal_api/public/configure_reason.h" #include "sync/internal_api/public/engine/polling_constants.h" +#include "sync/internal_api/public/read_node.h" +#include "sync/internal_api/public/read_transaction.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/public/user_share.h" +#include "sync/internal_api/public/util/experiments.h" +#include "sync/internal_api/public/write_node.h" +#include "sync/internal_api/public/write_transaction.h" #include "sync/internal_api/syncapi_internal.h" #include "sync/internal_api/syncapi_server_connection_manager.h" -#include "sync/internal_api/user_share.h" -#include "sync/internal_api/write_node.h" -#include "sync/internal_api/write_transaction.h" #include "sync/js/js_arg_list.h" #include "sync/js/js_backend.h" #include "sync/js/js_event_details.h" @@ -54,7 +55,6 @@ #include "sync/syncable/directory_change_delegate.h" #include "sync/syncable/syncable.h" #include "sync/util/cryptographer.h" -#include "sync/util/experiments.h" #include "sync/util/get_session_name.h" #include "sync/util/time.h" diff --git a/sync/internal_api/syncapi_server_connection_manager.cc b/sync/internal_api/syncapi_server_connection_manager.cc index ce62d86..ca849ae 100644 --- a/sync/internal_api/syncapi_server_connection_manager.cc +++ b/sync/internal_api/syncapi_server_connection_manager.cc @@ -6,8 +6,8 @@ #include "net/base/net_errors.h" #include "net/http/http_status_code.h" -#include "sync/internal_api/http_post_provider_factory.h" -#include "sync/internal_api/http_post_provider_interface.h" +#include "sync/internal_api/public/http_post_provider_factory.h" +#include "sync/internal_api/public/http_post_provider_interface.h" using browser_sync::HttpResponse; diff --git a/sync/internal_api/syncapi_server_connection_manager_unittest.cc b/sync/internal_api/syncapi_server_connection_manager_unittest.cc index 0c81e98..77b5244 100644 --- a/sync/internal_api/syncapi_server_connection_manager_unittest.cc +++ b/sync/internal_api/syncapi_server_connection_manager_unittest.cc @@ -12,8 +12,8 @@ #include "base/threading/thread.h" #include "base/time.h" #include "net/base/net_errors.h" -#include "sync/internal_api/http_post_provider_factory.h" -#include "sync/internal_api/http_post_provider_interface.h" +#include "sync/internal_api/public/http_post_provider_factory.h" +#include "sync/internal_api/public/http_post_provider_interface.h" #include "testing/gtest/include/gtest/gtest.h" using base::TimeDelta; diff --git a/sync/internal_api/syncapi_unittest.cc b/sync/internal_api/syncapi_unittest.cc index 6380db3..1f1079c 100644 --- a/sync/internal_api/syncapi_unittest.cc +++ b/sync/internal_api/syncapi_unittest.cc @@ -25,19 +25,19 @@ #include "base/values.h" #include "sync/engine/nigori_util.h" #include "sync/engine/sync_scheduler.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/change_record.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/http_post_provider_factory.h" +#include "sync/internal_api/public/http_post_provider_interface.h" +#include "sync/internal_api/public/read_node.h" +#include "sync/internal_api/public/read_transaction.h" +#include "sync/internal_api/public/sync_manager.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" +#include "sync/internal_api/public/test/test_user_share.h" +#include "sync/internal_api/public/write_node.h" +#include "sync/internal_api/public/write_transaction.h" #include "sync/internal_api/syncapi_internal.h" -#include "sync/internal_api/test_user_share.h" -#include "sync/internal_api/write_node.h" -#include "sync/internal_api/write_transaction.h" #include "sync/js/js_arg_list.h" #include "sync/js/js_backend.h" #include "sync/js/js_event_handler.h" diff --git a/sync/internal_api/test_user_share.cc b/sync/internal_api/test/test_user_share.cc index 743f3d0..c028d66 100644 --- a/sync/internal_api/test_user_share.cc +++ b/sync/internal_api/test/test_user_share.cc @@ -2,14 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "sync/internal_api/test_user_share.h" +#include "sync/internal_api/public/test/test_user_share.h" #include "base/compiler_specific.h" +#include "sync/test/engine/test_directory_setter_upper.h" #include "testing/gtest/include/gtest/gtest.h" namespace browser_sync { -TestUserShare::TestUserShare() {} +TestUserShare::TestUserShare() : dir_maker_(new TestDirectorySetterUpper()) {} TestUserShare::~TestUserShare() { if (user_share_.get()) @@ -18,11 +19,11 @@ TestUserShare::~TestUserShare() { void TestUserShare::SetUp() { user_share_.reset(new sync_api::UserShare()); - dir_maker_.SetUp(); + dir_maker_->SetUp(); // The pointer is owned by dir_maker_, we should not be storing it in a // scoped_ptr. We must be careful to ensure the scoped_ptr never deletes it. - user_share_->directory.reset(dir_maker_.directory()); + user_share_->directory.reset(dir_maker_->directory()); } void TestUserShare::TearDown() { @@ -30,7 +31,7 @@ void TestUserShare::TearDown() { ignore_result(user_share_->directory.release()); user_share_.reset(); - dir_maker_.TearDown(); + dir_maker_->TearDown(); } sync_api::UserShare* TestUserShare::user_share() { diff --git a/sync/internal_api/user_share.cc b/sync/internal_api/user_share.cc index a0a77ba..9bf0b46 100644 --- a/sync/internal_api/user_share.cc +++ b/sync/internal_api/user_share.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "sync/internal_api/user_share.h" +#include "sync/internal_api/public/user_share.h" #include "sync/syncable/syncable.h" diff --git a/sync/internal_api/write_node.cc b/sync/internal_api/write_node.cc index 68d3db7..bbd3035 100644 --- a/sync/internal_api/write_node.cc +++ b/sync/internal_api/write_node.cc @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "sync/internal_api/write_node.h" +#include "sync/internal_api/public/write_node.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "sync/engine/nigori_util.h" -#include "sync/internal_api/base_transaction.h" +#include "sync/internal_api/public/base_transaction.h" +#include "sync/internal_api/public/write_transaction.h" #include "sync/internal_api/syncapi_internal.h" -#include "sync/internal_api/write_transaction.h" #include "sync/protocol/app_specifics.pb.h" #include "sync/protocol/autofill_specifics.pb.h" #include "sync/protocol/bookmark_specifics.pb.h" diff --git a/sync/internal_api/write_transaction.cc b/sync/internal_api/write_transaction.cc index b141b8c..a354bcd 100644 --- a/sync/internal_api/write_transaction.cc +++ b/sync/internal_api/write_transaction.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "sync/internal_api/write_transaction.h" +#include "sync/internal_api/public/write_transaction.h" #include "sync/syncable/syncable.h" diff --git a/sync/js/DEPS b/sync/js/DEPS index 82d1d29..22a89b2 100644 --- a/sync/js/DEPS +++ b/sync/js/DEPS @@ -1,3 +1,4 @@ include_rules = [ + "+sync/internal_api/public/util", "+sync/util", ] diff --git a/sync/js/js_arg_list.h b/sync/js/js_arg_list.h index aab49d9..40cf712 100644 --- a/sync/js/js_arg_list.h +++ b/sync/js/js_arg_list.h @@ -11,7 +11,7 @@ #include <string> #include "base/values.h" -#include "sync/util/immutable.h" +#include "sync/internal_api/public/util/immutable.h" namespace browser_sync { diff --git a/sync/js/js_event_details.h b/sync/js/js_event_details.h index df59851..fe05066 100644 --- a/sync/js/js_event_details.h +++ b/sync/js/js_event_details.h @@ -11,7 +11,7 @@ #include <string> #include "base/values.h" -#include "sync/util/immutable.h" +#include "sync/internal_api/public/util/immutable.h" namespace browser_sync { diff --git a/sync/js/js_test_util.h b/sync/js/js_test_util.h index ef6bec7..3e8b24a 100644 --- a/sync/js/js_test_util.h +++ b/sync/js/js_test_util.h @@ -10,11 +10,11 @@ #include <string> #include "base/memory/weak_ptr.h" +#include "sync/internal_api/public/util/weak_handle.h" #include "sync/js/js_backend.h" #include "sync/js/js_controller.h" #include "sync/js/js_event_handler.h" #include "sync/js/js_reply_handler.h" -#include "sync/util/weak_handle.h" #include "testing/gmock/include/gmock/gmock.h" namespace base { diff --git a/sync/js/sync_js_controller.h b/sync/js/sync_js_controller.h index 6e8f100..dcc792d2 100644 --- a/sync/js/sync_js_controller.h +++ b/sync/js/sync_js_controller.h @@ -13,10 +13,10 @@ #include "base/compiler_specific.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" +#include "sync/internal_api/public/util/weak_handle.h" #include "sync/js/js_arg_list.h" #include "sync/js/js_controller.h" #include "sync/js/js_event_handler.h" -#include "sync/util/weak_handle.h" namespace browser_sync { diff --git a/sync/notifier/DEPS b/sync/notifier/DEPS index 4c55aa9..b718f9e 100644 --- a/sync/notifier/DEPS +++ b/sync/notifier/DEPS @@ -6,6 +6,7 @@ include_rules = [ "+net/url_request/url_request_test_util.h", "+sync/internal_api/public/syncable", + "+sync/internal_api/public/util", "+sync/protocol/service_constants.h", "+sync/util", diff --git a/sync/notifier/chrome_invalidation_client.h b/sync/notifier/chrome_invalidation_client.h index ce0939b..fe25dc3 100644 --- a/sync/notifier/chrome_invalidation_client.h +++ b/sync/notifier/chrome_invalidation_client.h @@ -19,10 +19,10 @@ #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/internal_api/public/util/weak_handle.h" #include "sync/notifier/chrome_system_resources.h" #include "sync/notifier/invalidation_state_tracker.h" #include "sync/notifier/state_writer.h" -#include "sync/util/weak_handle.h" namespace buzz { class XmppTaskParentInterface; diff --git a/sync/notifier/chrome_invalidation_client_unittest.cc b/sync/notifier/chrome_invalidation_client_unittest.cc index 92f697f12..f1470ac 100644 --- a/sync/notifier/chrome_invalidation_client_unittest.cc +++ b/sync/notifier/chrome_invalidation_client_unittest.cc @@ -11,9 +11,9 @@ #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/internal_api/public/util/weak_handle.h" #include "sync/notifier/chrome_invalidation_client.h" #include "sync/notifier/mock_invalidation_state_tracker.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.h b/sync/notifier/invalidation_notifier.h index f7f2efd..4ac715e 100644 --- a/sync/notifier/invalidation_notifier.h +++ b/sync/notifier/invalidation_notifier.h @@ -21,10 +21,10 @@ #include "base/observer_list.h" #include "base/threading/non_thread_safe.h" #include "sync/internal_api/public/syncable/model_type.h" +#include "sync/internal_api/public/util/weak_handle.h" #include "sync/notifier/chrome_invalidation_client.h" #include "sync/notifier/invalidation_state_tracker.h" #include "sync/notifier/sync_notifier.h" -#include "sync/util/weak_handle.h" namespace notifier { class PushClient; diff --git a/sync/notifier/invalidation_notifier_unittest.cc b/sync/notifier/invalidation_notifier_unittest.cc index 8219ad8..16b70c1 100644 --- a/sync/notifier/invalidation_notifier_unittest.cc +++ b/sync/notifier/invalidation_notifier_unittest.cc @@ -12,10 +12,10 @@ #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/internal_api/public/util/weak_handle.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/util/weak_handle.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/sync/notifier/non_blocking_invalidation_notifier.h b/sync/notifier/non_blocking_invalidation_notifier.h index 31efc74..dfcf63f 100644 --- a/sync/notifier/non_blocking_invalidation_notifier.h +++ b/sync/notifier/non_blocking_invalidation_notifier.h @@ -17,10 +17,10 @@ #include "base/memory/weak_ptr.h" #include "base/observer_list.h" #include "jingle/notifier/base/notifier_options.h" +#include "sync/internal_api/public/util/weak_handle.h" #include "sync/notifier/invalidation_state_tracker.h" #include "sync/notifier/sync_notifier.h" #include "sync/notifier/sync_notifier_observer.h" -#include "sync/util/weak_handle.h" namespace base { class SingleThreadTaskRunner; diff --git a/sync/notifier/non_blocking_invalidation_notifier_unittest.cc b/sync/notifier/non_blocking_invalidation_notifier_unittest.cc index 4ac2504..42cc5d1 100644 --- a/sync/notifier/non_blocking_invalidation_notifier_unittest.cc +++ b/sync/notifier/non_blocking_invalidation_notifier_unittest.cc @@ -12,9 +12,9 @@ #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/internal_api/public/util/weak_handle.h" #include "sync/notifier/invalidation_state_tracker.h" #include "sync/notifier/mock_sync_notifier_observer.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/sync_notifier_factory.h b/sync/notifier/sync_notifier_factory.h index 9e14fcd..a695ce0 100644 --- a/sync/notifier/sync_notifier_factory.h +++ b/sync/notifier/sync_notifier_factory.h @@ -9,8 +9,8 @@ #include "base/memory/weak_ptr.h" #include "jingle/notifier/base/notifier_options.h" +#include "sync/internal_api/public/util/weak_handle.h" #include "sync/notifier/invalidation_state_tracker.h" -#include "sync/util/weak_handle.h" namespace sync_notifier { diff --git a/sync/sync.gyp b/sync/sync.gyp index 5372b9d..934d318 100644 --- a/sync/sync.gyp +++ b/sync/sync.gyp @@ -53,8 +53,16 @@ '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/experiments.h', + 'internal_api/public/util/immutable.h', 'internal_api/public/util/syncer_error.cc', 'internal_api/public/util/syncer_error.h', + 'internal_api/public/util/report_unrecoverable_error_function.h', + 'internal_api/public/util/unrecoverable_error_handler.h', + 'internal_api/public/util/unrecoverable_error_info.h', + 'internal_api/public/util/unrecoverable_error_info.cc', + 'internal_api/public/util/weak_handle.cc', + 'internal_api/public/util/weak_handle.h', 'engine/all_status.cc', 'engine/all_status.h', 'engine/apply_updates_command.cc', @@ -172,7 +180,6 @@ 'util/data_type_histogram.h', 'util/encryptor.h', - 'util/experiments.h', 'util/extensions_activity_monitor.cc', 'util/extensions_activity_monitor.h', 'util/get_session_name.cc', @@ -181,21 +188,14 @@ 'util/get_session_name_mac.h', 'util/get_session_name_win.cc', 'util/get_session_name_win.h', - 'util/immutable.h', 'util/logging.cc', 'util/logging.h', 'util/nigori.cc', 'util/nigori.h', - 'util/report_unrecoverable_error_function.h', 'util/session_utils_android.cc', 'util/session_utils_android.h', 'util/time.cc', 'util/time.h', - 'util/unrecoverable_error_handler.h', - 'util/unrecoverable_error_info.h', - 'util/unrecoverable_error_info.cc', - 'util/weak_handle.cc', - 'util/weak_handle.h', ], }, @@ -274,39 +274,39 @@ 'sync', ], 'sources': [ + 'internal_api/public/base_node.h', + 'internal_api/public/base_transaction.h', + 'internal_api/public/change_record.h', + 'internal_api/public/configure_reason.h', + 'internal_api/public/http_post_provider_factory.h', + 'internal_api/public/http_post_provider_interface.h', + 'internal_api/public/read_node.h', + 'internal_api/public/read_transaction.h', + 'internal_api/public/sync_manager.h', + 'internal_api/public/user_share.h', + 'internal_api/public/write_node.h', + 'internal_api/public/write_transaction.h', 'internal_api/base_node.cc', - 'internal_api/base_node.h', 'internal_api/base_transaction.cc', - 'internal_api/base_transaction.h', 'internal_api/change_record.cc', - 'internal_api/change_record.h', 'internal_api/change_reorder_buffer.cc', 'internal_api/change_reorder_buffer.h', - 'internal_api/configure_reason.h', 'internal_api/debug_info_event_listener.cc', 'internal_api/debug_info_event_listener.h', - 'internal_api/http_post_provider_factory.h', - 'internal_api/http_post_provider_interface.h', 'internal_api/js_mutation_event_observer.cc', 'internal_api/js_mutation_event_observer.h', 'internal_api/js_sync_manager_observer.cc', 'internal_api/js_sync_manager_observer.h', 'internal_api/read_node.cc', - 'internal_api/read_node.h', 'internal_api/read_transaction.cc', - 'internal_api/read_transaction.h', 'internal_api/syncapi_internal.cc', 'internal_api/syncapi_internal.h', 'internal_api/syncapi_server_connection_manager.cc', 'internal_api/syncapi_server_connection_manager.h', 'internal_api/sync_manager.cc', - 'internal_api/sync_manager.h', 'internal_api/user_share.cc', - 'internal_api/user_share.h', 'internal_api/write_node.cc', - 'internal_api/write_node.h', 'internal_api/write_transaction.cc', - 'internal_api/write_transaction.h', ], }, @@ -445,8 +445,8 @@ 'test_support_sync', ], 'sources': [ - 'internal_api/test_user_share.cc', - 'internal_api/test_user_share.h', + 'internal_api/public/test/test_user_share.h', + 'internal_api/test/test_user_share.cc', ], }, @@ -509,6 +509,7 @@ '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', + 'internal_api/public/util/immutable_unittest.cc', 'engine/apply_updates_command_unittest.cc', 'engine/build_commit_command_unittest.cc', 'engine/cleanup_disabled_types_command_unittest.cc', @@ -545,10 +546,9 @@ 'util/data_encryption_win_unittest.cc', 'util/data_type_histogram_unittest.cc', 'util/get_session_name_unittest.cc', - 'util/immutable_unittest.cc', 'util/nigori_unittest.cc', 'util/protobuf_unittest.cc', - 'util/weak_handle_unittest.cc', + 'internal_api/public/util/weak_handle_unittest.cc', ], }, }, @@ -651,7 +651,7 @@ '..', ], 'sources': [ - 'internal_api/change_record_unittest.cc', + 'internal_api/public/change_record_unittest.cc', 'internal_api/debug_info_event_listener_unittest.cc', 'internal_api/js_mutation_event_observer_unittest.cc', 'internal_api/js_sync_manager_observer_unittest.cc', diff --git a/sync/syncable/DEPS b/sync/syncable/DEPS index 7b13d73..a92e267 100644 --- a/sync/syncable/DEPS +++ b/sync/syncable/DEPS @@ -3,6 +3,7 @@ include_rules = [ "+sql", "+sync/internal_api/public/engine", "+sync/internal_api/public/syncable", + "+sync/internal_api/public/util", "+sync/protocol", "+sync/test", "+sync/util", diff --git a/sync/syncable/syncable.h b/sync/syncable/syncable.h index 16aa0a2..0cab389 100644 --- a/sync/syncable/syncable.h +++ b/sync/syncable/syncable.h @@ -27,16 +27,16 @@ #include "base/synchronization/lock.h" #include "base/time.h" #include "sync/internal_api/public/syncable/model_type.h" +#include "sync/internal_api/public/util/immutable.h" +#include "sync/internal_api/public/util/report_unrecoverable_error_function.h" +#include "sync/internal_api/public/util/unrecoverable_error_handler.h" +#include "sync/internal_api/public/util/weak_handle.h" #include "sync/protocol/sync.pb.h" #include "sync/syncable/blob.h" #include "sync/syncable/dir_open_result.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/time.h" -#include "sync/util/unrecoverable_error_handler.h" -#include "sync/util/weak_handle.h" namespace base { class DictionaryValue; diff --git a/sync/test/engine/test_directory_setter_upper.h b/sync/test/engine/test_directory_setter_upper.h index 9244138..7e2f894 100644 --- a/sync/test/engine/test_directory_setter_upper.h +++ b/sync/test/engine/test_directory_setter_upper.h @@ -36,12 +36,15 @@ #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" #include "base/scoped_temp_dir.h" -#include "sync/util/test_unrecoverable_error_handler.h" -#include "sync/syncable/syncable.h" #include "sync/test/fake_encryptor.h" #include "sync/test/null_directory_change_delegate.h" +#include "sync/util/test_unrecoverable_error_handler.h" #include "testing/gmock/include/gmock/gmock.h" +namespace syncable { + class Directory; +} + namespace browser_sync { class TestDirectorySetterUpper { @@ -59,11 +62,10 @@ class TestDirectorySetterUpper { syncable::Directory* directory() { return directory_.get(); } - protected: + private: syncable::NullDirectoryChangeDelegate delegate_; TestUnrecoverableErrorHandler handler_; - private: void RunInvariantCheck(); ScopedTempDir temp_dir_; diff --git a/sync/test/null_transaction_observer.h b/sync/test/null_transaction_observer.h index fbddadd..6fa36e2 100644 --- a/sync/test/null_transaction_observer.h +++ b/sync/test/null_transaction_observer.h @@ -6,7 +6,7 @@ #define SYNC_TEST_NULL_TRANSACTION_OBSERVER_H_ #pragma once -#include "sync/util/weak_handle.h" +#include "sync/internal_api/public/util/weak_handle.h" namespace syncable { diff --git a/sync/util/DEPS b/sync/util/DEPS index a951508..69e34a9 100644 --- a/sync/util/DEPS +++ b/sync/util/DEPS @@ -1,6 +1,7 @@ include_rules = [ "+crypto", "+sync/internal_api/public/syncable", + "+sync/internal_api/public/util", "+sync/protocol", "+sync/test/fake_encryptor.h", diff --git a/sync/util/test_unrecoverable_error_handler.h b/sync/util/test_unrecoverable_error_handler.h index 408d806..d375bd9 100644 --- a/sync/util/test_unrecoverable_error_handler.h +++ b/sync/util/test_unrecoverable_error_handler.h @@ -7,7 +7,7 @@ #pragma once #include "base/compiler_specific.h" -#include "sync/util/unrecoverable_error_handler.h" +#include "sync/internal_api/public/util/unrecoverable_error_handler.h" namespace browser_sync { |