OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "base/basictypes.h" | 5 #include "base/basictypes.h" |
6 #include "base/compiler_specific.h" | 6 #include "base/compiler_specific.h" |
7 #include "base/file_util.h" | 7 #include "base/file_util.h" |
8 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
9 #include "base/message_loop.h" | 9 #include "base/message_loop.h" |
10 #include "base/values.h" | 10 #include "base/values.h" |
(...skipping 529 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
540 virtual void UpdateRegisteredIds(syncer::InvalidationHandler* handler, | 540 virtual void UpdateRegisteredIds(syncer::InvalidationHandler* handler, |
541 const syncer::ObjectIdSet& ids) OVERRIDE { | 541 const syncer::ObjectIdSet& ids) OVERRIDE { |
542 service_->UpdateRegisteredInvalidationIds(handler, ids); | 542 service_->UpdateRegisteredInvalidationIds(handler, ids); |
543 } | 543 } |
544 | 544 |
545 virtual void UnregisterHandler( | 545 virtual void UnregisterHandler( |
546 syncer::InvalidationHandler* handler) OVERRIDE { | 546 syncer::InvalidationHandler* handler) OVERRIDE { |
547 service_->UnregisterInvalidationHandler(handler); | 547 service_->UnregisterInvalidationHandler(handler); |
548 } | 548 } |
549 | 549 |
| 550 virtual void Acknowledge(const invalidation::ObjectId& id, |
| 551 const syncer::AckHandle& ack_handle) OVERRIDE { |
| 552 // Do nothing. |
| 553 } |
| 554 |
550 virtual syncer::InvalidatorState GetInvalidatorState() const OVERRIDE { | 555 virtual syncer::InvalidatorState GetInvalidatorState() const OVERRIDE { |
551 return service_->GetInvalidatorState(); | 556 return service_->GetInvalidatorState(); |
552 } | 557 } |
553 | 558 |
554 virtual void SetUniqueId(const std::string& unique_id) OVERRIDE { | 559 virtual void SetUniqueId(const std::string& unique_id) OVERRIDE { |
555 // Do nothing. | 560 // Do nothing. |
556 } | 561 } |
557 | 562 |
558 virtual void UpdateCredentials( | 563 virtual void UpdateCredentials( |
559 const std::string& email, const std::string& token) OVERRIDE { | 564 const std::string& email, const std::string& token) OVERRIDE { |
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
628 namespace syncer { | 633 namespace syncer { |
629 namespace { | 634 namespace { |
630 | 635 |
631 // ProfileSyncService should behave just like an invalidator. | 636 // ProfileSyncService should behave just like an invalidator. |
632 INSTANTIATE_TYPED_TEST_CASE_P( | 637 INSTANTIATE_TYPED_TEST_CASE_P( |
633 ProfileSyncServiceInvalidatorTest, InvalidatorTest, | 638 ProfileSyncServiceInvalidatorTest, InvalidatorTest, |
634 ::browser_sync::ProfileSyncServiceInvalidatorTestDelegate); | 639 ::browser_sync::ProfileSyncServiceInvalidatorTestDelegate); |
635 | 640 |
636 } // namespace | 641 } // namespace |
637 } // namespace syncer | 642 } // namespace syncer |
OLD | NEW |