sync: Per-type update application

sync/sessions/status_controller.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/status_controller.h"
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "sync/internal_api/public/base/model_type.h"
 #include "sync/protocol/sync_protocol_error.h"
 
 namespace syncer {
 namespace sessions {
 
-StatusController::StatusController()
-    : group_restriction_in_effect_(false),
-      group_restriction_(GROUP_PASSIVE) {
+StatusController::StatusController() {
 }
 
 StatusController::~StatusController() {}
 
 void StatusController::increment_num_updates_downloaded_by(int value) {
   model_neutral_.num_updates_downloaded_total += value;
 }
 
 void StatusController::set_types_needing_local_migration(ModelTypeSet types) {
   model_neutral_.types_needing_local_migration = types;
@@ skipping 93 matching lines @@
 
 int StatusController::num_server_overwrites() const {
   return model_neutral_.num_server_overwrites;
 }
 
 int StatusController::num_encryption_conflicts() const {
   return model_neutral_.num_encryption_conflicts;
 }
 
 int StatusController::num_hierarchy_conflicts() const {
-  DCHECK(!group_restriction_in_effect_)
-      << "num_hierarchy_conflicts applies to all ModelSafeGroups";
   return model_neutral_.num_hierarchy_conflicts;
 }
 
 int StatusController::num_server_conflicts() const {
-  DCHECK(!group_restriction_in_effect_)
-      << "num_server_conflicts applies to all ModelSafeGroups";
   return model_neutral_.num_server_conflicts;
 }
 
 int StatusController::TotalNumConflictingItems() const {
-  DCHECK(!group_restriction_in_effect_)
-      << "TotalNumConflictingItems applies to all ModelSafeGroups";
   int sum = 0;
   sum += num_encryption_conflicts();
   sum += num_hierarchy_conflicts();
   sum += num_server_conflicts();
   return sum;
 }
 
 bool StatusController::ServerSaysNothingMoreToDownload() const {
   if (!download_updates_succeeded())
     return false;
@@ skipping 10 matching lines @@
 void StatusController::set_debug_info_sent() {
   model_neutral_.debug_info_sent = true;
 }
 
 bool StatusController::debug_info_sent() const {
   return model_neutral_.debug_info_sent;
 }
 
 }  // namespace sessions
 }  // namespace syncer