Make SyncBackendRegistrar aware of loaded data

sync/sessions/sync_session_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "sync/sessions/sync_session.h"
 
 #include "base/compiler_specific.h"
 #include "base/location.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop.h"
@@ skipping 23 matching lines @@
   SyncSessionTest() : controller_invocations_allowed_(false) {}
 
   SyncSession* MakeSession() {
     std::vector<ModelSafeWorker*> workers;
     GetWorkers(&workers);
     return new SyncSession(context_.get(), this, SyncSourceInfo(),
                            routes_, workers);
   }
 
   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;
     scoped_refptr<ModelSafeWorker> passive_worker(
         new FakeModelWorker(GROUP_PASSIVE));
     scoped_refptr<ModelSafeWorker> ui_worker(
         new FakeModelWorker(GROUP_UI));
     scoped_refptr<ModelSafeWorker> db_worker(
         new FakeModelWorker(GROUP_DB));
     workers_.clear();
     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_,

[Nicolas Zea, 2012/07/23 20:47:15]

nit: these args should be on their own lines unless they're intimately related
to one another.

[rlarocque, 2012/07/23 23:16:10]

Done.

+            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));
   }
   virtual void TearDown() {
     session_.reset();
     context_.reset();
   }
 
   virtual void OnSilencedUntil(const base::TimeTicks& silenced_until) OVERRIDE {
     FailControllerInvocationIfDisabled("OnSilencedUntil");
@@ skipping 412 matching lines @@
 
   ASSERT_EQ(3U, types_with_payloads.size());
   EXPECT_EQ(types_with_payloads[BOOKMARKS], payload);
   EXPECT_EQ(types_with_payloads[PASSWORDS], payload);
   EXPECT_EQ(types_with_payloads[AUTOFILL], payload);
 }
 
 }  // namespace
 }  // namespace sessions
 }  // namespace syncer