diff options
27 files changed, 54 insertions, 98 deletions
diff --git a/chrome/browser/sync/glue/sync_backend_host_core.cc b/chrome/browser/sync/glue/sync_backend_host_core.cc index 50f16cc..7e4ab73 100644 --- a/chrome/browser/sync/glue/sync_backend_host_core.cc +++ b/chrome/browser/sync/glue/sync_backend_host_core.cc @@ -366,7 +366,7 @@ void SyncBackendHostCore::OnProtocolEvent( void SyncBackendHostCore::DoOnInvalidatorStateChange( syncer::InvalidatorState state) { DCHECK_EQ(base::MessageLoop::current(), sync_loop_); - sync_manager_->OnInvalidatorStateChange(state); + sync_manager_->SetInvalidatorEnabled(state == syncer::INVALIDATIONS_ENABLED); } void SyncBackendHostCore::DoOnIncomingInvalidation( diff --git a/sync/engine/DEPS b/sync/engine/DEPS index 6a46bae..cdc35af 100644 --- a/sync/engine/DEPS +++ b/sync/engine/DEPS @@ -1,7 +1,6 @@ include_rules = [ "+sync/base", "+sync/internal_api/public", - "+sync/notifier", "+sync/protocol", "+sync/sessions", "+sync/syncable", diff --git a/sync/engine/sync_scheduler_impl.cc b/sync/engine/sync_scheduler_impl.cc index c5629ba..4d38c21 100644 --- a/sync/engine/sync_scheduler_impl.cc +++ b/sync/engine/sync_scheduler_impl.cc @@ -16,7 +16,6 @@ #include "base/message_loop/message_loop.h" #include "sync/engine/backoff_delay_provider.h" #include "sync/engine/syncer.h" -#include "sync/notifier/object_id_invalidation_map.h" #include "sync/protocol/proto_enum_conversions.h" #include "sync/protocol/sync.pb.h" #include "sync/util/data_type_histogram.h" diff --git a/sync/engine/sync_scheduler_unittest.cc b/sync/engine/sync_scheduler_unittest.cc index 7cf7360..3a79d5c 100644 --- a/sync/engine/sync_scheduler_unittest.cc +++ b/sync/engine/sync_scheduler_unittest.cc @@ -13,8 +13,6 @@ #include "sync/engine/syncer.h" #include "sync/internal_api/public/base/cancelation_signal.h" #include "sync/internal_api/public/base/model_type_test_util.h" -#include "sync/notifier/invalidation_util.h" -#include "sync/notifier/object_id_invalidation_map.h" #include "sync/sessions/test_util.h" #include "sync/test/callback_counter.h" #include "sync/test/engine/fake_model_worker.h" diff --git a/sync/internal_api/DEPS b/sync/internal_api/DEPS index dec66bc..13e6b8a 100644 --- a/sync/internal_api/DEPS +++ b/sync/internal_api/DEPS @@ -7,7 +7,6 @@ include_rules = [ "+sync/base", "+sync/engine", "+sync/js", - "+sync/notifier", "+sync/protocol", "+sync/sessions", "+sync/syncable", diff --git a/sync/internal_api/debug_info_event_listener.cc b/sync/internal_api/debug_info_event_listener.cc index b3d5505..3e7780c 100644 --- a/sync/internal_api/debug_info_event_listener.cc +++ b/sync/internal_api/debug_info_event_listener.cc @@ -4,7 +4,6 @@ #include "sync/internal_api/debug_info_event_listener.h" -#include "sync/notifier/object_id_invalidation_map.h" #include "sync/util/cryptographer.h" namespace syncer { @@ -128,21 +127,6 @@ void DebugInfoEventListener::OnNudgeFromDatatype(ModelType datatype) { AddEventToQueue(event_info); } -void DebugInfoEventListener::OnIncomingNotification( - const ObjectIdInvalidationMap& invalidation_map) { - DCHECK(thread_checker_.CalledOnValidThread()); - sync_pb::DebugEventInfo event_info; - ModelTypeSet types = - ObjectIdSetToModelTypeSet(invalidation_map.GetObjectIds()); - - for (ModelTypeSet::Iterator it = types.First(); it.Good(); it.Inc()) { - event_info.add_datatypes_notified_from_server( - GetSpecificsFieldNumberFromModelType(it.Get())); - } - - AddEventToQueue(event_info); -} - void DebugInfoEventListener::GetDebugInfo(sync_pb::DebugInfo* debug_info) { DCHECK(thread_checker_.CalledOnValidThread()); DCHECK_LE(events_.size(), kMaxEntries); diff --git a/sync/internal_api/debug_info_event_listener.h b/sync/internal_api/debug_info_event_listener.h index 1f71682..64fd830 100644 --- a/sync/internal_api/debug_info_event_listener.h +++ b/sync/internal_api/debug_info_event_listener.h @@ -73,7 +73,6 @@ class SYNC_EXPORT_PRIVATE DebugInfoEventListener // Sync manager events. void OnNudgeFromDatatype(ModelType datatype); - void OnIncomingNotification(const ObjectIdInvalidationMap& invalidations); // DebugInfoGetter implementation. virtual void GetDebugInfo(sync_pb::DebugInfo* debug_info) OVERRIDE; diff --git a/sync/internal_api/public/base/model_type_test_util.cc b/sync/internal_api/public/base/model_type_test_util.cc index 5893922..8c1164b 100644 --- a/sync/internal_api/public/base/model_type_test_util.cc +++ b/sync/internal_api/public/base/model_type_test_util.cc @@ -6,25 +6,6 @@ namespace syncer { -syncer::Invalidation BuildInvalidation( - ModelType type, - int version, - const std::string& payload) { - invalidation::ObjectId id; - bool result = RealModelTypeToObjectId(type, &id); - DCHECK(result); - return Invalidation::Init(id, version, payload); -} - -ObjectIdInvalidationMap BuildInvalidationMap( - ModelType type, - int version, - const std::string& payload) { - ObjectIdInvalidationMap map; - map.Insert(BuildInvalidation(type, version, payload)); - return map; -} - void PrintTo(ModelTypeSet model_types, ::std::ostream* os) { *os << ModelTypeSetToString(model_types); } diff --git a/sync/internal_api/public/base/model_type_test_util.h b/sync/internal_api/public/base/model_type_test_util.h index 1412f66..cd347cb 100644 --- a/sync/internal_api/public/base/model_type_test_util.h +++ b/sync/internal_api/public/base/model_type_test_util.h @@ -8,26 +8,10 @@ #include <ostream> #include "sync/internal_api/public/base/model_type.h" -#include "sync/notifier/object_id_invalidation_map.h" #include "testing/gmock/include/gmock/gmock.h" namespace syncer { -// Builds an invaliation map that contains a single invalidation with specified -// type, version, and payload. The type will be converted from a ModelType to -// and ObjectId. -ObjectIdInvalidationMap BuildInvalidationMap( - ModelType type, - int version, - const std::string& payload); - -// Builds an invalidation. Similar to Invalidation::Init, but its first -// parameter is a ModelType rather than an ObjectId. -syncer::Invalidation BuildInvalidation( - ModelType type, - int version, - const std::string& payload); - // Defined for googletest. Forwards to ModelTypeSetToString(). void PrintTo(ModelTypeSet model_types, ::std::ostream* os); diff --git a/sync/internal_api/public/sync_manager.h b/sync/internal_api/public/sync_manager.h index b8cc50d..ee03ba4 100644 --- a/sync/internal_api/public/sync_manager.h +++ b/sync/internal_api/public/sync_manager.h @@ -30,7 +30,6 @@ #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/notifier/invalidation_handler.h" #include "sync/protocol/sync_protocol_error.h" namespace sync_pb { @@ -312,7 +311,7 @@ class SYNC_EXPORT SyncManager { const base::Closure& retry_task) = 0; // Inform the syncer of a change in the invalidator's state. - virtual void OnInvalidatorStateChange(InvalidatorState state) = 0; + virtual void SetInvalidatorEnabled(bool invalidator_enabled) = 0; // Inform the syncer that its cached information about a type is obsolete. virtual void OnIncomingInvalidation( diff --git a/sync/internal_api/public/test/fake_sync_manager.h b/sync/internal_api/public/test/fake_sync_manager.h index f4ea19a..24dd9c5 100644 --- a/sync/internal_api/public/test/fake_sync_manager.h +++ b/sync/internal_api/public/test/fake_sync_manager.h @@ -67,7 +67,7 @@ class FakeSyncManager : public SyncManager { scoped_ptr<InvalidationInterface> interface) OVERRIDE; // Posts a method to update the invalidator state on the sync thread. - virtual void OnInvalidatorStateChange(InvalidatorState state) OVERRIDE; + virtual void SetInvalidatorEnabled(bool invalidator_enabled) OVERRIDE; // Block until the sync thread has finished processing any pending messages. void WaitForSyncThread(); diff --git a/sync/internal_api/sync_manager_impl.cc b/sync/internal_api/sync_manager_impl.cc index 168c19f..256a5c9 100644 --- a/sync/internal_api/sync_manager_impl.cc +++ b/sync/internal_api/sync_manager_impl.cc @@ -39,9 +39,6 @@ #include "sync/internal_api/sync_context_proxy_impl.h" #include "sync/internal_api/syncapi_internal.h" #include "sync/internal_api/syncapi_server_connection_manager.h" -#include "sync/notifier/invalidation_util.h" -#include "sync/notifier/invalidator.h" -#include "sync/notifier/object_id_invalidation_map.h" #include "sync/protocol/proto_value_conversions.h" #include "sync/protocol/sync.pb.h" #include "sync/sessions/directory_type_debug_info_emitter.h" @@ -170,7 +167,6 @@ SyncManagerImpl::SyncManagerImpl(const std::string& name) change_delegate_(NULL), initialized_(false), observing_network_connectivity_changes_(false), - invalidator_state_(DEFAULT_INVALIDATION_ERROR), report_unrecoverable_error_function_(NULL), weak_ptr_factory_(this) { // Pre-fill |notification_info_map_|. @@ -984,16 +980,12 @@ scoped_ptr<base::ListValue> SyncManagerImpl::GetAllNodesForType( return it->second->GetAllNodes(); } -void SyncManagerImpl::OnInvalidatorStateChange(InvalidatorState state) { +void SyncManagerImpl::SetInvalidatorEnabled(bool invalidator_enabled) { DCHECK(thread_checker_.CalledOnValidThread()); - const std::string& state_str = InvalidatorStateToString(state); - invalidator_state_ = state; - DVLOG(1) << "Invalidator state changed to: " << state_str; - const bool notifications_enabled = - (invalidator_state_ == INVALIDATIONS_ENABLED); - allstatus_.SetNotificationsEnabled(notifications_enabled); - scheduler_->SetNotificationsEnabled(notifications_enabled); + DVLOG(1) << "Invalidator enabled state is now: " << invalidator_enabled; + allstatus_.SetNotificationsEnabled(invalidator_enabled); + scheduler_->SetNotificationsEnabled(invalidator_enabled); } void SyncManagerImpl::OnIncomingInvalidation( diff --git a/sync/internal_api/sync_manager_impl.h b/sync/internal_api/sync_manager_impl.h index c447aa1..3037535 100644 --- a/sync/internal_api/sync_manager_impl.h +++ b/sync/internal_api/sync_manager_impl.h @@ -26,7 +26,6 @@ #include "sync/internal_api/public/user_share.h" #include "sync/internal_api/sync_encryption_handler_impl.h" #include "sync/js/js_backend.h" -#include "sync/notifier/invalidation_handler.h" #include "sync/syncable/directory_change_delegate.h" #include "sync/util/cryptographer.h" #include "sync/util/time.h" @@ -104,7 +103,7 @@ class SYNC_EXPORT_PRIVATE SyncManagerImpl const ModelSafeRoutingInfo& new_routing_info, const base::Closure& ready_task, const base::Closure& retry_task) OVERRIDE; - virtual void OnInvalidatorStateChange(InvalidatorState state) OVERRIDE; + virtual void SetInvalidatorEnabled(bool invalidator_enabled) OVERRIDE; virtual void OnIncomingInvalidation( syncer::ModelType type, scoped_ptr<InvalidationInterface> invalidation) OVERRIDE; @@ -213,8 +212,6 @@ class SYNC_EXPORT_PRIVATE SyncManagerImpl private: friend class SyncManagerTest; FRIEND_TEST_ALL_PREFIXES(SyncManagerTest, NudgeDelayTest); - FRIEND_TEST_ALL_PREFIXES(SyncManagerTest, OnNotificationStateChange); - FRIEND_TEST_ALL_PREFIXES(SyncManagerTest, OnIncomingNotification); FRIEND_TEST_ALL_PREFIXES(SyncManagerTest, PurgeDisabledTypes); FRIEND_TEST_ALL_PREFIXES(SyncManagerTest, PurgeUnappliedTypes); @@ -346,8 +343,6 @@ class SYNC_EXPORT_PRIVATE SyncManagerImpl bool observing_network_connectivity_changes_; - InvalidatorState invalidator_state_; - // Map used to store the notification info to be displayed in // about:sync page. NotificationInfoMap notification_info_map_; diff --git a/sync/internal_api/sync_manager_impl_unittest.cc b/sync/internal_api/sync_manager_impl_unittest.cc index 1436e9a..d2b1dec 100644 --- a/sync/internal_api/sync_manager_impl_unittest.cc +++ b/sync/internal_api/sync_manager_impl_unittest.cc @@ -45,8 +45,6 @@ #include "sync/js/js_backend.h" #include "sync/js/js_event_handler.h" #include "sync/js/js_test_util.h" -#include "sync/notifier/invalidation_handler.h" -#include "sync/notifier/invalidator.h" #include "sync/protocol/bookmark_specifics.pb.h" #include "sync/protocol/encryption.pb.h" #include "sync/protocol/extension_specifics.pb.h" @@ -979,7 +977,7 @@ class SyncManagerTest : public testing::Test, void SimulateInvalidatorStateChangeForTest(InvalidatorState state) { DCHECK(sync_manager_.thread_checker_.CalledOnValidThread()); - sync_manager_.OnInvalidatorStateChange(state); + sync_manager_.SetInvalidatorEnabled(state == INVALIDATIONS_ENABLED); } void SetProgressMarkerForType(ModelType type, bool set) { diff --git a/sync/internal_api/sync_rollback_manager_base.cc b/sync/internal_api/sync_rollback_manager_base.cc index ec1099e..6f864a3 100644 --- a/sync/internal_api/sync_rollback_manager_base.cc +++ b/sync/internal_api/sync_rollback_manager_base.cc @@ -128,7 +128,7 @@ void SyncRollbackManagerBase::ConfigureSyncer( ready_task.Run(); } -void SyncRollbackManagerBase::OnInvalidatorStateChange(InvalidatorState state) { +void SyncRollbackManagerBase::SetInvalidatorEnabled(bool invalidator_enabled) { } void SyncRollbackManagerBase::OnIncomingInvalidation( diff --git a/sync/internal_api/sync_rollback_manager_base.h b/sync/internal_api/sync_rollback_manager_base.h index e18535f..9aaf02b 100644 --- a/sync/internal_api/sync_rollback_manager_base.h +++ b/sync/internal_api/sync_rollback_manager_base.h @@ -71,7 +71,7 @@ class SYNC_EXPORT_PRIVATE SyncRollbackManagerBase : const ModelSafeRoutingInfo& new_routing_info, const base::Closure& ready_task, const base::Closure& retry_task) OVERRIDE; - virtual void OnInvalidatorStateChange(InvalidatorState state) OVERRIDE; + virtual void SetInvalidatorEnabled(bool invalidator_enabled) OVERRIDE; virtual void OnIncomingInvalidation( syncer::ModelType type, scoped_ptr<InvalidationInterface> invalidation) OVERRIDE; diff --git a/sync/internal_api/test/fake_sync_manager.cc b/sync/internal_api/test/fake_sync_manager.cc index 5bb4f10..e01c64a 100644 --- a/sync/internal_api/test/fake_sync_manager.cc +++ b/sync/internal_api/test/fake_sync_manager.cc @@ -18,8 +18,6 @@ #include "sync/internal_api/public/http_post_provider_factory.h" #include "sync/internal_api/public/internal_components_factory.h" #include "sync/internal_api/public/util/weak_handle.h" -#include "sync/notifier/invalidator.h" -#include "sync/notifier/object_id_invalidation_map.h" #include "sync/syncable/directory.h" #include "sync/test/fake_sync_encryption_handler.h" @@ -272,7 +270,7 @@ ModelTypeSet FakeSyncManager::GetLastRefreshRequestTypes() { return last_refresh_request_types_; } -void FakeSyncManager::OnInvalidatorStateChange(InvalidatorState state) { +void FakeSyncManager::SetInvalidatorEnabled(bool invalidator_enabled) { // Do nothing. } diff --git a/sync/notifier/invalidation_handler.cc b/sync/notifier/invalidation_handler.cc new file mode 100644 index 0000000..8ec9440 --- /dev/null +++ b/sync/notifier/invalidation_handler.cc @@ -0,0 +1,15 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "sync/notifier/invalidation_handler.h" + +namespace syncer { + +InvalidationHandler::InvalidationHandler() { +} + +InvalidationHandler::~InvalidationHandler() { +} + +} // namespace syncer diff --git a/sync/notifier/invalidation_handler.h b/sync/notifier/invalidation_handler.h index a999cf6..9cd41fe 100644 --- a/sync/notifier/invalidation_handler.h +++ b/sync/notifier/invalidation_handler.h @@ -5,6 +5,8 @@ #ifndef SYNC_NOTIFIER_INVALIDATION_HANDLER_H_ #define SYNC_NOTIFIER_INVALIDATION_HANDLER_H_ +#include <string> + #include "sync/base/sync_export.h" #include "sync/internal_api/public/base/invalidator_state.h" @@ -14,6 +16,8 @@ class ObjectIdInvalidationMap; class SYNC_EXPORT InvalidationHandler { public: + InvalidationHandler(); + // Called when the invalidator state changes. virtual void OnInvalidatorStateChange(InvalidatorState state) = 0; @@ -26,7 +30,7 @@ class SYNC_EXPORT InvalidationHandler { virtual std::string GetOwnerName() const = 0; protected: - virtual ~InvalidationHandler() {} + virtual ~InvalidationHandler(); }; } // namespace syncer diff --git a/sync/notifier/invalidator.cc b/sync/notifier/invalidator.cc new file mode 100644 index 0000000..5508b89 --- /dev/null +++ b/sync/notifier/invalidator.cc @@ -0,0 +1,15 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "sync/notifier/invalidator.h" + +namespace syncer { + +Invalidator::Invalidator() { +} + +Invalidator::~Invalidator() { +} + +} // namespace syncer diff --git a/sync/notifier/invalidator.h b/sync/notifier/invalidator.h index 0ed26e2..7a75fbb 100644 --- a/sync/notifier/invalidator.h +++ b/sync/notifier/invalidator.h @@ -11,6 +11,7 @@ #include <string> +#include "base/callback.h" #include "sync/base/sync_export.h" #include "sync/internal_api/public/base/invalidator_state.h" #include "sync/internal_api/public/base/model_type.h" @@ -21,8 +22,8 @@ class InvalidationHandler; class SYNC_EXPORT Invalidator { public: - Invalidator() {} - virtual ~Invalidator() {} + Invalidator(); + virtual ~Invalidator(); // Clients should follow the pattern below: // diff --git a/sync/sessions/DEPS b/sync/sessions/DEPS index 36fed20..01f46fea 100644 --- a/sync/sessions/DEPS +++ b/sync/sessions/DEPS @@ -2,7 +2,6 @@ include_rules = [ "+sync/base", "+sync/engine", "+sync/internal_api/public", - "+sync/notifier", "+sync/protocol", "+sync/syncable", "+sync/test", diff --git a/sync/sessions/nudge_tracker.cc b/sync/sessions/nudge_tracker.cc index 8dd6d2a..e4ebc23 100644 --- a/sync/sessions/nudge_tracker.cc +++ b/sync/sessions/nudge_tracker.cc @@ -5,9 +5,6 @@ #include "sync/sessions/nudge_tracker.h" #include "base/basictypes.h" -#include "sync/internal_api/public/base/invalidation.h" -#include "sync/notifier/invalidation_util.h" -#include "sync/notifier/object_id_invalidation_map.h" #include "sync/protocol/sync.pb.h" namespace syncer { diff --git a/sync/sessions/nudge_tracker.h b/sync/sessions/nudge_tracker.h index 4c8d445..a602537 100644 --- a/sync/sessions/nudge_tracker.h +++ b/sync/sessions/nudge_tracker.h @@ -13,6 +13,7 @@ #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" #include "sync/base/sync_export.h" +#include "sync/internal_api/public/base/invalidation_interface.h" #include "sync/internal_api/public/base/model_type.h" #include "sync/protocol/sync.pb.h" #include "sync/sessions/data_type_tracker.h" diff --git a/sync/sessions/nudge_tracker_unittest.cc b/sync/sessions/nudge_tracker_unittest.cc index 53b38a7..4599e69 100644 --- a/sync/sessions/nudge_tracker_unittest.cc +++ b/sync/sessions/nudge_tracker_unittest.cc @@ -5,9 +5,6 @@ #include "base/message_loop/message_loop.h" #include "base/run_loop.h" #include "sync/internal_api/public/base/model_type_test_util.h" -#include "sync/notifier/invalidation_util.h" -#include "sync/notifier/mock_ack_handler.h" -#include "sync/notifier/object_id_invalidation_map.h" #include "sync/sessions/nudge_tracker.h" #include "sync/test/mock_invalidation.h" #include "sync/test/mock_invalidation_tracker.h" diff --git a/sync/sync_notifier.gypi b/sync/sync_notifier.gypi index dbbc232..f0f3eee 100644 --- a/sync/sync_notifier.gypi +++ b/sync/sync_notifier.gypi @@ -25,6 +25,7 @@ 'sources': [ 'notifier/ack_handler.cc', 'notifier/ack_handler.h', + 'notifier/invalidation_handler.cc', 'notifier/invalidation_handler.h', 'notifier/invalidation_state_tracker.cc', 'notifier/invalidation_state_tracker.h', @@ -32,6 +33,7 @@ 'notifier/invalidation_util.h', 'notifier/unacked_invalidation_set.cc', 'notifier/unacked_invalidation_set.h', + 'notifier/invalidator.cc', 'notifier/invalidator.h', 'notifier/mock_ack_handler.cc', 'notifier/mock_ack_handler.h', diff --git a/sync/tools/sync_client.cc b/sync/tools/sync_client.cc index 6f3e9e3..6813823 100644 --- a/sync/tools/sync_client.cc +++ b/sync/tools/sync_client.cc @@ -221,7 +221,7 @@ class InvalidatorShim : public InvalidationHandler { : sync_manager_(sync_manager) {} virtual void OnInvalidatorStateChange(InvalidatorState state) OVERRIDE { - sync_manager_->OnInvalidatorStateChange(state); + sync_manager_->SetInvalidatorEnabled(state == INVALIDATIONS_ENABLED); } virtual void OnIncomingInvalidation( |