| 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 "chrome/browser/invalidation/invalidator_storage.h" | 5 #include "chrome/browser/invalidation/invalidator_storage.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/message_loop.h" | 8 #include "base/message_loop.h" |
| 9 #include "base/message_loop/message_loop_proxy.h" | 9 #include "base/message_loop/message_loop_proxy.h" |
| 10 #include "base/prefs/pref_service.h" | 10 #include "base/prefs/pref_service.h" |
| (...skipping 29 matching lines...) Expand all Loading... |
| 40 | 40 |
| 41 class InvalidatorStorageTest : public testing::Test { | 41 class InvalidatorStorageTest : public testing::Test { |
| 42 public: | 42 public: |
| 43 InvalidatorStorageTest() | 43 InvalidatorStorageTest() |
| 44 : kBookmarksId_(kChromeSyncSourceId, "BOOKMARK"), | 44 : kBookmarksId_(kChromeSyncSourceId, "BOOKMARK"), |
| 45 kPreferencesId_(kChromeSyncSourceId, "PREFERENCE"), | 45 kPreferencesId_(kChromeSyncSourceId, "PREFERENCE"), |
| 46 kAppNotificationsId_(kChromeSyncSourceId, "APP_NOTIFICATION"), | 46 kAppNotificationsId_(kChromeSyncSourceId, "APP_NOTIFICATION"), |
| 47 kAutofillId_(kChromeSyncSourceId, "AUTOFILL") {} | 47 kAutofillId_(kChromeSyncSourceId, "AUTOFILL") {} |
| 48 | 48 |
| 49 virtual void SetUp() { | 49 virtual void SetUp() { |
| 50 InvalidatorStorage::RegisterUserPrefs(pref_service_.registry()); | 50 InvalidatorStorage::RegisterProfilePrefs(pref_service_.registry()); |
| 51 } | 51 } |
| 52 | 52 |
| 53 protected: | 53 protected: |
| 54 TestingPrefServiceSyncable pref_service_; | 54 TestingPrefServiceSyncable pref_service_; |
| 55 | 55 |
| 56 const invalidation::ObjectId kBookmarksId_; | 56 const invalidation::ObjectId kBookmarksId_; |
| 57 const invalidation::ObjectId kPreferencesId_; | 57 const invalidation::ObjectId kPreferencesId_; |
| 58 const invalidation::ObjectId kAppNotificationsId_; | 58 const invalidation::ObjectId kAppNotificationsId_; |
| 59 const invalidation::ObjectId kAutofillId_; | 59 const invalidation::ObjectId kAutofillId_; |
| 60 | 60 |
| (...skipping 436 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 497 EXPECT_TRUE(it->second.IsValid()); | 497 EXPECT_TRUE(it->second.IsValid()); |
| 498 state_map[kBookmarksId_].expected = it->second; | 498 state_map[kBookmarksId_].expected = it->second; |
| 499 EXPECT_EQ(state_map, storage.GetAllInvalidationStates()); | 499 EXPECT_EQ(state_map, storage.GetAllInvalidationStates()); |
| 500 | 500 |
| 501 storage.Acknowledge(kBookmarksId_, it->second); | 501 storage.Acknowledge(kBookmarksId_, it->second); |
| 502 state_map[kBookmarksId_].current = it->second; | 502 state_map[kBookmarksId_].current = it->second; |
| 503 EXPECT_EQ(state_map, storage.GetAllInvalidationStates()); | 503 EXPECT_EQ(state_map, storage.GetAllInvalidationStates()); |
| 504 } | 504 } |
| 505 | 505 |
| 506 } // namespace invalidation | 506 } // namespace invalidation |
| OLD | NEW |