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

Unified Diff: chrome/browser/sync/sessions/status_controller_unittest.cc

Issue 8638001: [Sync] Made some sync session member functions const (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Constify a few more, sync to head Created 9 years, 1 month 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/sync/sessions/status_controller_unittest.cc
diff --git a/chrome/browser/sync/sessions/status_controller_unittest.cc b/chrome/browser/sync/sessions/status_controller_unittest.cc
index bebbd18cb1afdeff742285e3ddc879efd43be914..7b850e83bea649d08858be470c507cc7e3edcb18 100644
--- a/chrome/browser/sync/sessions/status_controller_unittest.cc
+++ b/chrome/browser/sync/sessions/status_controller_unittest.cc
@@ -154,19 +154,19 @@ TEST_F(StatusControllerTest, HasConflictingUpdates) {
EXPECT_FALSE(status.HasConflictingUpdates());
{
ScopedModelSafeGroupRestriction r(&status, GROUP_UI);
- EXPECT_FALSE(status.update_progress().HasConflictingUpdates());
+ EXPECT_FALSE(status.update_progress());
status.mutable_update_progress()->AddAppliedUpdate(SUCCESS,
syncable::Id());
status.mutable_update_progress()->AddAppliedUpdate(CONFLICT,
syncable::Id());
- EXPECT_TRUE(status.update_progress().HasConflictingUpdates());
+ EXPECT_TRUE(status.update_progress()->HasConflictingUpdates());
}
EXPECT_TRUE(status.HasConflictingUpdates());
{
ScopedModelSafeGroupRestriction r(&status, GROUP_PASSIVE);
- EXPECT_FALSE(status.update_progress().HasConflictingUpdates());
+ EXPECT_FALSE(status.update_progress());
}
}
@@ -186,17 +186,18 @@ TEST_F(StatusControllerTest, TotalNumConflictingItems) {
TestIdFactory f;
{
ScopedModelSafeGroupRestriction r(&status, GROUP_UI);
+ EXPECT_FALSE(status.conflict_progress());
status.mutable_conflict_progress()->AddConflictingItemById(f.NewLocalId());
status.mutable_conflict_progress()->AddConflictingItemById(f.NewLocalId());
- EXPECT_EQ(2, status.conflict_progress().ConflictingItemsSize());
+ EXPECT_EQ(2, status.conflict_progress()->ConflictingItemsSize());
}
EXPECT_EQ(2, status.TotalNumConflictingItems());
{
ScopedModelSafeGroupRestriction r(&status, GROUP_DB);
- EXPECT_EQ(0, status.conflict_progress().ConflictingItemsSize());
+ EXPECT_FALSE(status.conflict_progress());
status.mutable_conflict_progress()->AddConflictingItemById(f.NewLocalId());
status.mutable_conflict_progress()->AddConflictingItemById(f.NewLocalId());
- EXPECT_EQ(2, status.conflict_progress().ConflictingItemsSize());
+ EXPECT_EQ(2, status.conflict_progress()->ConflictingItemsSize());
}
EXPECT_EQ(4, status.TotalNumConflictingItems());
}
@@ -204,8 +205,9 @@ TEST_F(StatusControllerTest, TotalNumConflictingItems) {
// Basic test that non group-restricted state accessors don't cause violations.
TEST_F(StatusControllerTest, Unrestricted) {
StatusController status(routes_);
- status.GetUnrestrictedUpdateProgress(
- GROUP_UI)->SuccessfullyAppliedUpdateCount();
+ const UpdateProgress* progress =
+ status.GetUnrestrictedUpdateProgress(GROUP_UI);
+ EXPECT_FALSE(progress);
status.mutable_commit_message();
status.commit_response();
status.mutable_commit_response();

Powered by Google App Engine
This is Rietveld 408576698