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 467 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
478 virtual void UpdateRegisteredIds(syncer::InvalidationHandler* handler, | 478 virtual void UpdateRegisteredIds(syncer::InvalidationHandler* handler, |
479 const syncer::ObjectIdSet& ids) OVERRIDE { | 479 const syncer::ObjectIdSet& ids) OVERRIDE { |
480 service_->UpdateRegisteredInvalidationIds(handler, ids); | 480 service_->UpdateRegisteredInvalidationIds(handler, ids); |
481 } | 481 } |
482 | 482 |
483 virtual void UnregisterHandler( | 483 virtual void UnregisterHandler( |
484 syncer::InvalidationHandler* handler) OVERRIDE { | 484 syncer::InvalidationHandler* handler) OVERRIDE { |
485 service_->UnregisterInvalidationHandler(handler); | 485 service_->UnregisterInvalidationHandler(handler); |
486 } | 486 } |
487 | 487 |
| 488 virtual void Acknowledge(const invalidation::ObjectId& id, |
| 489 const syncer::AckHandle& ack_handle) OVERRIDE { |
| 490 // Do nothing. |
| 491 } |
| 492 |
488 virtual syncer::InvalidatorState GetInvalidatorState() const OVERRIDE { | 493 virtual syncer::InvalidatorState GetInvalidatorState() const OVERRIDE { |
489 return service_->GetInvalidatorState(); | 494 return service_->GetInvalidatorState(); |
490 } | 495 } |
491 | 496 |
492 virtual void SetUniqueId(const std::string& unique_id) OVERRIDE { | 497 virtual void SetUniqueId(const std::string& unique_id) OVERRIDE { |
493 // Do nothing. | 498 // Do nothing. |
494 } | 499 } |
495 | 500 |
496 virtual void SetStateDeprecated(const std::string& state) OVERRIDE { | 501 virtual void SetStateDeprecated(const std::string& state) OVERRIDE { |
497 // Do nothing. | 502 // Do nothing. |
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
575 namespace syncer { | 580 namespace syncer { |
576 namespace { | 581 namespace { |
577 | 582 |
578 // ProfileSyncService should behave just like an invalidator. | 583 // ProfileSyncService should behave just like an invalidator. |
579 INSTANTIATE_TYPED_TEST_CASE_P( | 584 INSTANTIATE_TYPED_TEST_CASE_P( |
580 ProfileSyncServiceInvalidatorTest, InvalidatorTest, | 585 ProfileSyncServiceInvalidatorTest, InvalidatorTest, |
581 ::browser_sync::ProfileSyncServiceInvalidatorTestDelegate); | 586 ::browser_sync::ProfileSyncServiceInvalidatorTestDelegate); |
582 | 587 |
583 } // namespace | 588 } // namespace |
584 } // namespace syncer | 589 } // namespace syncer |
OLD | NEW |