| 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/memory/scoped_ptr.h" | 7 #include "base/memory/scoped_ptr.h" |
| 8 #include "google/cacheinvalidation/types.pb.h" | 8 #include "google/cacheinvalidation/types.pb.h" |
| 9 #include "sync/notifier/fake_invalidation_handler.h" | 9 #include "sync/notifier/fake_invalidation_handler.h" |
| 10 #include "sync/notifier/invalidator_registrar.h" | 10 #include "sync/notifier/invalidator_registrar.h" |
| (...skipping 24 matching lines...) Expand all Loading... |
| 35 | 35 |
| 36 virtual void UpdateRegisteredIds(InvalidationHandler* handler, | 36 virtual void UpdateRegisteredIds(InvalidationHandler* handler, |
| 37 const ObjectIdSet& ids) OVERRIDE { | 37 const ObjectIdSet& ids) OVERRIDE { |
| 38 registrar_.UpdateRegisteredIds(handler, ids); | 38 registrar_.UpdateRegisteredIds(handler, ids); |
| 39 } | 39 } |
| 40 | 40 |
| 41 virtual void UnregisterHandler(InvalidationHandler* handler) OVERRIDE { | 41 virtual void UnregisterHandler(InvalidationHandler* handler) OVERRIDE { |
| 42 registrar_.UnregisterHandler(handler); | 42 registrar_.UnregisterHandler(handler); |
| 43 } | 43 } |
| 44 | 44 |
| 45 virtual void Acknowledge(const invalidation::ObjectId& id, | |
| 46 const AckHandle& ack_handle) OVERRIDE { | |
| 47 // Do nothing. | |
| 48 } | |
| 49 | |
| 50 virtual InvalidatorState GetInvalidatorState() const OVERRIDE { | 45 virtual InvalidatorState GetInvalidatorState() const OVERRIDE { |
| 51 return registrar_.GetInvalidatorState(); | 46 return registrar_.GetInvalidatorState(); |
| 52 } | 47 } |
| 53 | 48 |
| 54 virtual void UpdateCredentials( | 49 virtual void UpdateCredentials( |
| 55 const std::string& email, const std::string& token) OVERRIDE { | 50 const std::string& email, const std::string& token) OVERRIDE { |
| 56 // Do nothing. | 51 // Do nothing. |
| 57 } | 52 } |
| 58 | 53 |
| 59 private: | 54 private: |
| (...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 154 EXPECT_DEATH({ registrar.UpdateRegisteredIds(&handler2, ids); }, ""); | 149 EXPECT_DEATH({ registrar.UpdateRegisteredIds(&handler2, ids); }, ""); |
| 155 | 150 |
| 156 registrar.UnregisterHandler(&handler2); | 151 registrar.UnregisterHandler(&handler2); |
| 157 registrar.UnregisterHandler(&handler1); | 152 registrar.UnregisterHandler(&handler1); |
| 158 } | 153 } |
| 159 #endif // GTEST_HAS_DEATH_TEST | 154 #endif // GTEST_HAS_DEATH_TEST |
| 160 | 155 |
| 161 } // namespace | 156 } // namespace |
| 162 | 157 |
| 163 } // namespace syncer | 158 } // namespace syncer |
| OLD | NEW |