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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 9305001: sync: Remove the remaining conflict sets code (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Review updates and renames Created 8 years, 11 months 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
« chrome/browser/sync/sessions/sync_session.cc ('K') | « chrome/browser/sync/sessions/sync_session.cc ('k') | chrome/chrome.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/sessions/sync_session_unittest.cc
diff --git a/chrome/browser/sync/sessions/sync_session_unittest.cc b/chrome/browser/sync/sessions/sync_session_unittest.cc
index 4ec6efc0b3f8f4e6a504eabf2e35569abd89acd0..70382a02d8cf2a08dc968b94da731ac6a9cba42c 100644
--- a/chrome/browser/sync/sessions/sync_session_unittest.cc
+++ b/chrome/browser/sync/sessions/sync_session_unittest.cc
@@ -158,7 +158,7 @@ TEST_F(SyncSessionTest, EnabledGroupsWithConflicts) {
// Put GROUP_UI in conflict.
session->mutable_status_controller()->
GetUnrestrictedMutableConflictProgressForTest(GROUP_UI)->
- AddConflictingItemById(syncable::Id());
+ AddSimpleConflictingItemById(syncable::Id());
std::set<ModelSafeGroup> expected_enabled_groups_with_conflicts;
expected_enabled_groups_with_conflicts.insert(GROUP_UI);
EXPECT_EQ(expected_enabled_groups_with_conflicts,
« chrome/browser/sync/sessions/sync_session.cc ('K') | « chrome/browser/sync/sessions/sync_session.cc ('k') | chrome/chrome.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698