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

Unified Diff: sync/sessions/sync_session_unittest.cc

Issue 10804039: Make SyncBackendRegistrar aware of loaded data (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 8 years, 5 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
« no previous file with comments | « sync/sessions/sync_session_context.cc ('k') | sync/test/engine/syncer_command_test.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/sessions/sync_session_unittest.cc
diff --git a/sync/sessions/sync_session_unittest.cc b/sync/sessions/sync_session_unittest.cc
index 1029e1dbdbc253ef87f5eafa0ac49a30064b1886..bd17d35908c1aa8df47a6fbfe13841b669a0327b 100644
--- a/sync/sessions/sync_session_unittest.cc
+++ b/sync/sessions/sync_session_unittest.cc
@@ -41,17 +41,6 @@ class SyncSessionTest : public testing::Test,
}
virtual void SetUp() {
- ModelSafeRoutingInfo routing_info;
- std::vector<ModelSafeWorker*> workers;
-
- GetModelSafeRoutingInfo(&routing_info);
- GetWorkers(&workers);
-
- context_.reset(
- new SyncSessionContext(
- NULL, NULL, routing_info, workers, &extensions_activity_monitor_,
- throttled_data_type_tracker_.get(),
- std::vector<SyncEngineEventListener*>(), NULL, NULL));
routes_.clear();
routes_[BOOKMARKS] = GROUP_UI;
routes_[AUTOFILL] = GROUP_DB;
@@ -65,6 +54,22 @@ class SyncSessionTest : public testing::Test,
workers_.push_back(passive_worker);
workers_.push_back(ui_worker);
workers_.push_back(db_worker);
+
+ std::vector<ModelSafeWorker*> workers;
+ GetWorkers(&workers);
+
+ context_.reset(
+ new SyncSessionContext(
+ NULL,
+ NULL,
+ workers,
+ &extensions_activity_monitor_,
+ throttled_data_type_tracker_.get(),
+ std::vector<SyncEngineEventListener*>(),
+ NULL,
+ NULL));
+ context_->set_routing_info(routes_);
+
session_.reset(MakeSession());
throttled_data_type_tracker_.reset(new ThrottledDataTypeTracker(NULL));
}
« no previous file with comments | « sync/sessions/sync_session_context.cc ('k') | sync/test/engine/syncer_command_test.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698