Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(278)

Side by Side Diff: chrome/browser/sync/invalidations/invalidator_storage_unittest.cc

Issue 11570009: Split PrefService into PrefService, PrefServiceSimple and PrefServiceSyncable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to head again, previous had unrelated broken win_rel test. Created 8 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 5
6 #include "chrome/browser/sync/invalidations/invalidator_storage.h" 6 #include "chrome/browser/sync/invalidations/invalidator_storage.h"
7 7
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/message_loop.h" 9 #include "base/message_loop.h"
10 #include "base/message_loop_proxy.h" 10 #include "base/message_loop_proxy.h"
11 #include "base/string_number_conversions.h" 11 #include "base/string_number_conversions.h"
12 #include "base/string_util.h" 12 #include "base/string_util.h"
13 #include "chrome/browser/prefs/pref_service.h"
13 #include "chrome/common/pref_names.h" 14 #include "chrome/common/pref_names.h"
14 #include "chrome/test/base/testing_pref_service.h" 15 #include "chrome/test/base/testing_pref_service.h"
15 #include "sync/internal_api/public/base/invalidation_test_util.h" 16 #include "sync/internal_api/public/base/invalidation_test_util.h"
16 #include "testing/gmock/include/gmock/gmock.h" 17 #include "testing/gmock/include/gmock/gmock.h"
17 #include "testing/gtest/include/gtest/gtest.h" 18 #include "testing/gtest/include/gtest/gtest.h"
18 19
19 using syncer::InvalidationStateMap; 20 using syncer::InvalidationStateMap;
20 21
21 namespace browser_sync { 22 namespace browser_sync {
22 23
(...skipping 17 matching lines...) Expand all
40 41
41 class InvalidatorStorageTest : public testing::Test { 42 class InvalidatorStorageTest : public testing::Test {
42 public: 43 public:
43 InvalidatorStorageTest() 44 InvalidatorStorageTest()
44 : kBookmarksId_(kChromeSyncSourceId, "BOOKMARK"), 45 : kBookmarksId_(kChromeSyncSourceId, "BOOKMARK"),
45 kPreferencesId_(kChromeSyncSourceId, "PREFERENCE"), 46 kPreferencesId_(kChromeSyncSourceId, "PREFERENCE"),
46 kAppNotificationsId_(kChromeSyncSourceId, "APP_NOTIFICATION"), 47 kAppNotificationsId_(kChromeSyncSourceId, "APP_NOTIFICATION"),
47 kAutofillId_(kChromeSyncSourceId, "AUTOFILL") {} 48 kAutofillId_(kChromeSyncSourceId, "AUTOFILL") {}
48 49
49 protected: 50 protected:
50 TestingPrefService pref_service_; 51 TestingPrefServiceSyncable pref_service_;
51 52
52 const invalidation::ObjectId kBookmarksId_; 53 const invalidation::ObjectId kBookmarksId_;
53 const invalidation::ObjectId kPreferencesId_; 54 const invalidation::ObjectId kPreferencesId_;
54 const invalidation::ObjectId kAppNotificationsId_; 55 const invalidation::ObjectId kAppNotificationsId_;
55 const invalidation::ObjectId kAutofillId_; 56 const invalidation::ObjectId kAutofillId_;
56 57
57 MessageLoop loop_; 58 MessageLoop loop_;
58 }; 59 };
59 60
60 // Set invalidation states for various keys and verify that they are written and 61 // Set invalidation states for various keys and verify that they are written and
(...skipping 418 matching lines...) Expand 10 before | Expand all | Expand 10 after
479 EXPECT_TRUE(it->second.IsValid()); 480 EXPECT_TRUE(it->second.IsValid());
480 state_map[kBookmarksId_].expected = it->second; 481 state_map[kBookmarksId_].expected = it->second;
481 EXPECT_EQ(state_map, storage.GetAllInvalidationStates()); 482 EXPECT_EQ(state_map, storage.GetAllInvalidationStates());
482 483
483 storage.Acknowledge(kBookmarksId_, it->second); 484 storage.Acknowledge(kBookmarksId_, it->second);
484 state_map[kBookmarksId_].current = it->second; 485 state_map[kBookmarksId_].current = it->second;
485 EXPECT_EQ(state_map, storage.GetAllInvalidationStates()); 486 EXPECT_EQ(state_map, storage.GetAllInvalidationStates());
486 } 487 }
487 488
488 } // namespace browser_sync 489 } // namespace browser_sync
OLDNEW
« no previous file with comments | « chrome/browser/sync/invalidations/invalidator_storage.cc ('k') | chrome/browser/sync/profile_sync_components_factory_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698