sync: make scheduling logic and job ownership more obvious.

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 329 matching lines @@
   expected_enabled_groups_one.insert(GROUP_DB);
 
   std::set<ModelSafeGroup> expected_enabled_groups_two;
   expected_enabled_groups_two.insert(GROUP_PASSIVE);
   expected_enabled_groups_two.insert(GROUP_DB);
   expected_enabled_groups_two.insert(GROUP_UI);
 
   EXPECT_EQ(expected_enabled_groups_one, one.GetEnabledGroups());
   EXPECT_EQ(expected_enabled_groups_two, two.GetEnabledGroups());
 
-  two.RebaseRoutingInfoWithLatest(one);
+  two.RebaseRoutingInfoWithLatest(one.routing_info(), one.workers());
 
   EXPECT_EQ(expected_enabled_groups_one, one.GetEnabledGroups());
   EXPECT_EQ(expected_enabled_groups_one, two.GetEnabledGroups());
 
   // Make sure the source has not been touched.
   EXPECT_EQ(two.source().updates_source,
       sync_pb::GetUpdatesCallerInfo::LOCAL);
 
   // Make sure the payload is reduced to one.
   EXPECT_THAT(one_type, Eq(two.source().types));
@@ skipping 49 matching lines @@
       workers_second);
 
   std::set<ModelSafeGroup> expected_enabled_groups;
   expected_enabled_groups.insert(GROUP_PASSIVE);
   expected_enabled_groups.insert(GROUP_DB);
   expected_enabled_groups.insert(GROUP_UI);
 
   EXPECT_EQ(expected_enabled_groups, first.GetEnabledGroups());
   EXPECT_EQ(expected_enabled_groups, second.GetEnabledGroups());
 
-  second.RebaseRoutingInfoWithLatest(first);
+  second.RebaseRoutingInfoWithLatest(first.routing_info(), first.workers());
 
   EXPECT_EQ(expected_enabled_groups, first.GetEnabledGroups());
   EXPECT_EQ(expected_enabled_groups, second.GetEnabledGroups());
 
   // Make sure the source has not been touched.
   EXPECT_EQ(second.source().updates_source,
       sync_pb::GetUpdatesCallerInfo::LOCAL);
 
   // Make sure our payload is still the same.
   EXPECT_THAT(all_types, Eq(second.source().types));
@@ skipping 45 matching lines @@
 
   ASSERT_EQ(3U, invalidation_map.size());
   EXPECT_EQ(invalidation_map[BOOKMARKS].payload, payload);
   EXPECT_EQ(invalidation_map[PASSWORDS].payload, payload);
   EXPECT_EQ(invalidation_map[AUTOFILL].payload, payload);
 }
 
 }  // namespace
 }  // namespace sessions
 }  // namespace syncer