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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: sync/engine/syncer_unittest.cc

Issue 11314008: sync: Follow-up to conflict resolution refactor (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 2 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
« sync/engine/all_status.cc ('K') | « sync/engine/syncer.cc ('k') | sync/internal_api/js_sync_manager_observer_unittest.cc » ('j') | sync/internal_api/public/sessions/sync_session_snapshot_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/engine/syncer_unittest.cc
diff --git a/sync/engine/syncer_unittest.cc b/sync/engine/syncer_unittest.cc
index 5f0a8f3661e9eaedbd339405de5fdaf8b7bc0af1..7a432178f79218aad0285160a855d6629542e008 100644
--- a/sync/engine/syncer_unittest.cc
+++ b/sync/engine/syncer_unittest.cc
@@ -232,7 +232,6 @@ class SyncerTest : public testing::Test,
listeners, NULL, &traffic_recorder_,
true /* enable keystore encryption */));
context_->set_routing_info(routing_info);
- ASSERT_FALSE(context_->resolver());
syncer_ = new Syncer();
session_.reset(MakeSession());
« sync/engine/all_status.cc ('K') | « sync/engine/syncer.cc ('k') | sync/internal_api/js_sync_manager_observer_unittest.cc » ('j') | sync/internal_api/public/sessions/sync_session_snapshot_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698