| 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 25 matching lines...) Expand all Loading... |
| 36 | 36 |
| 37 virtual void UpdateRegisteredIds(InvalidationHandler* handler, | 37 virtual void UpdateRegisteredIds(InvalidationHandler* handler, |
| 38 const ObjectIdSet& ids) OVERRIDE { | 38 const ObjectIdSet& ids) OVERRIDE { |
| 39 registrar_.UpdateRegisteredIds(handler, ids); | 39 registrar_.UpdateRegisteredIds(handler, ids); |
| 40 } | 40 } |
| 41 | 41 |
| 42 virtual void UnregisterHandler(InvalidationHandler* handler) OVERRIDE { | 42 virtual void UnregisterHandler(InvalidationHandler* handler) OVERRIDE { |
| 43 registrar_.UnregisterHandler(handler); | 43 registrar_.UnregisterHandler(handler); |
| 44 } | 44 } |
| 45 | 45 |
| 46 virtual void Acknowledge(const invalidation::ObjectId& id, |
| 47 const AckHandle& ack_handle) OVERRIDE { |
| 48 // Do nothing. |
| 49 } |
| 50 |
| 46 virtual InvalidatorState GetInvalidatorState() const OVERRIDE { | 51 virtual InvalidatorState GetInvalidatorState() const OVERRIDE { |
| 47 return registrar_.GetInvalidatorState(); | 52 return registrar_.GetInvalidatorState(); |
| 48 } | 53 } |
| 49 | 54 |
| 50 virtual void SetUniqueId(const std::string& unique_id) OVERRIDE { | 55 virtual void SetUniqueId(const std::string& unique_id) OVERRIDE { |
| 51 // Do nothing. | 56 // Do nothing. |
| 52 } | 57 } |
| 53 | 58 |
| 54 virtual void UpdateCredentials( | 59 virtual void UpdateCredentials( |
| 55 const std::string& email, const std::string& token) OVERRIDE { | 60 const std::string& email, const std::string& token) OVERRIDE { |
| (...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 158 EXPECT_DEATH({ registrar.UpdateRegisteredIds(&handler2, ids); }, ""); | 163 EXPECT_DEATH({ registrar.UpdateRegisteredIds(&handler2, ids); }, ""); |
| 159 | 164 |
| 160 registrar.UnregisterHandler(&handler2); | 165 registrar.UnregisterHandler(&handler2); |
| 161 registrar.UnregisterHandler(&handler1); | 166 registrar.UnregisterHandler(&handler1); |
| 162 } | 167 } |
| 163 #endif // GTEST_HAS_DEATH_TEST | 168 #endif // GTEST_HAS_DEATH_TEST |
| 164 | 169 |
| 165 } // namespace | 170 } // namespace |
| 166 | 171 |
| 167 } // namespace syncer | 172 } // namespace syncer |
| OLD | NEW |