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

Side by Side Diff: chrome/browser/sync/sessions/sync_session_context_unittest.cc

Issue 8851006: [Sync] Replace all instances of ModelTypeSet with ModelEnumSet (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Cleanup pass #2 Created 9 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
« no previous file with comments | « chrome/browser/sync/sessions/sync_session_context.cc ('k') | chrome/browser/sync/sync_prefs.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/sync/sessions/sync_session_context.h" 5 #include "chrome/browser/sync/sessions/sync_session_context.h"
6 6
7 #include "chrome/browser/sync/syncable/model_type.h" 7 #include "chrome/browser/sync/syncable/model_type.h"
8 #include "testing/gtest/include/gtest/gtest.h" 8 #include "testing/gtest/include/gtest/gtest.h"
9 9
10 namespace browser_sync { 10 namespace browser_sync {
11 namespace sessions { 11 namespace sessions {
12 TEST(SyncSessionContextTest, AddUnthrottleTimeTest) { 12 TEST(SyncSessionContextTest, AddUnthrottleTimeTest) {
13 syncable::ModelTypeSet types; 13 const syncable::ModelEnumSet types(
14 types.insert(syncable::BOOKMARKS); 14 syncable::BOOKMARKS, syncable::PASSWORDS);
15 types.insert(syncable::PASSWORDS);
16 15
17 SyncSessionContext context; 16 SyncSessionContext context;
18 base::TimeTicks now = base::TimeTicks::Now(); 17 base::TimeTicks now = base::TimeTicks::Now();
19 context.SetUnthrottleTime(types, now); 18 context.SetUnthrottleTime(types, now);
20 19
21 EXPECT_EQ(context.unthrottle_times_.size(), 2U); 20 EXPECT_EQ(context.unthrottle_times_.size(), 2U);
22 EXPECT_EQ(context.unthrottle_times_[syncable::BOOKMARKS], now); 21 EXPECT_EQ(context.unthrottle_times_[syncable::BOOKMARKS], now);
23 EXPECT_EQ(context.unthrottle_times_[syncable::PASSWORDS], now); 22 EXPECT_EQ(context.unthrottle_times_[syncable::PASSWORDS], now);
24 } 23 }
25 24
26 TEST(SyncSessionContextTest, GetCurrentlyThrottledTypesTest) { 25 TEST(SyncSessionContextTest, GetCurrentlyThrottledTypesTest) {
27 syncable::ModelTypeSet types; 26 const syncable::ModelEnumSet types(
28 types.insert(syncable::BOOKMARKS); 27 syncable::BOOKMARKS, syncable::PASSWORDS);
29 types.insert(syncable::PASSWORDS);
30 28
31 SyncSessionContext context; 29 SyncSessionContext context;
32 base::TimeTicks now = base::TimeTicks::Now(); 30 base::TimeTicks now = base::TimeTicks::Now();
33 31
34 // Now update the throttled types with time set to 10 seconds earlier from 32 // Now update the throttled types with time set to 10 seconds earlier from
35 // now. 33 // now.
36 context.SetUnthrottleTime(types, now - base::TimeDelta::FromSeconds(10)); 34 context.SetUnthrottleTime(types, now - base::TimeDelta::FromSeconds(10));
37 context.PruneUnthrottledTypes(base::TimeTicks::Now()); 35 context.PruneUnthrottledTypes(base::TimeTicks::Now());
38 EXPECT_EQ(context.GetThrottledTypes(), syncable::ModelTypeSet()); 36 EXPECT_TRUE(context.GetThrottledTypes().Empty());
39 37
40 // Now update the throttled types with time set to 2 hours from now. 38 // Now update the throttled types with time set to 2 hours from now.
41 context.SetUnthrottleTime(types, now + base::TimeDelta::FromSeconds(1200)); 39 context.SetUnthrottleTime(types, now + base::TimeDelta::FromSeconds(1200));
42 context.PruneUnthrottledTypes(base::TimeTicks::Now()); 40 context.PruneUnthrottledTypes(base::TimeTicks::Now());
43 EXPECT_EQ(context.GetThrottledTypes(), types); 41 EXPECT_TRUE(context.GetThrottledTypes().Equals(types));
44 } 42 }
45 } // namespace sessions. 43 } // namespace sessions.
46 } // namespace browser_sync 44 } // namespace browser_sync
47 45
OLDNEW
« no previous file with comments | « chrome/browser/sync/sessions/sync_session_context.cc ('k') | chrome/browser/sync/sync_prefs.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698