[Sync] Add RequestCleanupDisabledTypes() method to SyncManager

chrome/browser/sync/glue/sync_backend_host_unittest.cc

 // Copyright (c) 2011 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 "chrome/browser/sync/glue/sync_backend_host.h"
 
 #include <cstddef>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
@@ skipping 106 matching lines @@
     syncable::ModelTypeSet types;
     ModelSafeRoutingInfo routing_info;
 
     scoped_ptr<SyncBackendHost::PendingConfigureDataTypesState>
         state(SyncBackendHost::MakePendingConfigModeState(
             data_type_controllers, types, NULL, &routing_info,
             sync_api::CONFIGURE_REASON_RECONFIGURATION, false));
     EXPECT_TRUE(routing_info.empty());
     EXPECT_FALSE(state->ready_task.get());
     EXPECT_EQ(types, state->initial_types);
-    EXPECT_FALSE(state->deleted_type);
     EXPECT_TRUE(state->added_types.none());
   }
 
   // No enabled types.
   {
     DataTypeController::TypeMap data_type_controllers;
     data_type_controllers[syncable::BOOKMARKS] = NULL;
     syncable::ModelTypeSet types;
     ModelSafeRoutingInfo routing_info;
 
     types.insert(syncable::NIGORI);
     scoped_ptr<SyncBackendHost::PendingConfigureDataTypesState>
         state(SyncBackendHost::MakePendingConfigModeState(
               data_type_controllers, types, NULL,
               &routing_info, sync_api::CONFIGURE_REASON_RECONFIGURATION, true));
     EXPECT_TRUE(routing_info.empty());
     EXPECT_FALSE(state->ready_task.get());
     EXPECT_EQ(types, state->initial_types);
-    EXPECT_TRUE(state->deleted_type);
     EXPECT_TRUE(state->added_types.none());
   }
 
   // Add type.
   {
     DataTypeController::TypeMap data_type_controllers;
     data_type_controllers[syncable::BOOKMARKS] = NULL;
     syncable::ModelTypeSet types;
     types.insert(syncable::BOOKMARKS);
     types.insert(syncable::NIGORI);
     ModelSafeRoutingInfo routing_info;
 
     scoped_ptr<SyncBackendHost::PendingConfigureDataTypesState>
         state(SyncBackendHost::MakePendingConfigModeState(
             data_type_controllers, types, NULL, &routing_info,
             sync_api::CONFIGURE_REASON_RECONFIGURATION, true));
 
     ModelSafeRoutingInfo expected_routing_info;
     expected_routing_info[syncable::BOOKMARKS] = GROUP_PASSIVE;
     EXPECT_EQ(expected_routing_info, routing_info);
     EXPECT_FALSE(state->ready_task.get());
     EXPECT_EQ(types, state->initial_types);
-    EXPECT_FALSE(state->deleted_type);
 
     syncable::ModelTypeBitSet expected_added_types;
     expected_added_types.set(syncable::BOOKMARKS);
     EXPECT_EQ(expected_added_types, state->added_types);
   }
 
   // Add existing type.
   {
     DataTypeController::TypeMap data_type_controllers;
     data_type_controllers[syncable::BOOKMARKS] = NULL;
     syncable::ModelTypeSet types;
     types.insert(syncable::BOOKMARKS);
     types.insert(syncable::NIGORI);
     ModelSafeRoutingInfo routing_info;
     routing_info[syncable::BOOKMARKS] = GROUP_PASSIVE;
     ModelSafeRoutingInfo expected_routing_info = routing_info;
 
     scoped_ptr<SyncBackendHost::PendingConfigureDataTypesState>
         state(SyncBackendHost::MakePendingConfigModeState(
             data_type_controllers, types, NULL, &routing_info,
             sync_api::CONFIGURE_REASON_RECONFIGURATION, true));
 
     EXPECT_EQ(expected_routing_info, routing_info);
     EXPECT_FALSE(state->ready_task.get());
     EXPECT_EQ(types, state->initial_types);
-    EXPECT_FALSE(state->deleted_type);
     EXPECT_TRUE(state->added_types.none());
   }
 
   // Delete type.
   {
     DataTypeController::TypeMap data_type_controllers;
     data_type_controllers[syncable::BOOKMARKS] = NULL;
     syncable::ModelTypeSet types;
     types.insert(syncable::NIGORI);
     ModelSafeRoutingInfo routing_info;
     routing_info[syncable::BOOKMARKS] = GROUP_PASSIVE;
 
     scoped_ptr<SyncBackendHost::PendingConfigureDataTypesState>
         state(SyncBackendHost::MakePendingConfigModeState(
             data_type_controllers, types, NULL, &routing_info,
             sync_api::CONFIGURE_REASON_RECONFIGURATION, true));
 
     ModelSafeRoutingInfo expected_routing_info;
     EXPECT_EQ(expected_routing_info, routing_info);
     EXPECT_FALSE(state->ready_task.get());
     EXPECT_EQ(types, state->initial_types);
-    EXPECT_TRUE(state->deleted_type);
     EXPECT_TRUE(state->added_types.none());
   }
 
   // Add Nigori.
   {
     DataTypeController::TypeMap data_type_controllers;
     syncable::ModelTypeSet types;
     types.insert(syncable::NIGORI);
     ModelSafeRoutingInfo routing_info;
 
     scoped_ptr<SyncBackendHost::PendingConfigureDataTypesState>
         state(SyncBackendHost::MakePendingConfigModeState(
             data_type_controllers, types, NULL, &routing_info,
             sync_api::CONFIGURE_REASON_RECONFIGURATION, false));
 
     ModelSafeRoutingInfo expected_routing_info;
     expected_routing_info[syncable::NIGORI] = GROUP_PASSIVE;
     EXPECT_EQ(expected_routing_info, routing_info);
     EXPECT_FALSE(state->ready_task.get());
     EXPECT_EQ(types, state->initial_types);
-    EXPECT_FALSE(state->deleted_type);
 
     syncable::ModelTypeBitSet expected_added_types;
     expected_added_types.set(syncable::NIGORI);
     EXPECT_EQ(expected_added_types, state->added_types);
   }
 
   // Delete Nigori.
   {
     DataTypeController::TypeMap data_type_controllers;
     syncable::ModelTypeSet types;
     ModelSafeRoutingInfo routing_info;
     routing_info[syncable::NIGORI] = GROUP_PASSIVE;
 
     scoped_ptr<SyncBackendHost::PendingConfigureDataTypesState>
         state(SyncBackendHost::MakePendingConfigModeState(
             data_type_controllers, types, NULL, &routing_info,
             sync_api::CONFIGURE_REASON_RECONFIGURATION, true));
 
     ModelSafeRoutingInfo expected_routing_info;
     EXPECT_EQ(expected_routing_info, routing_info);
     EXPECT_FALSE(state->ready_task.get());
     EXPECT_EQ(types, state->initial_types);
-    EXPECT_TRUE(state->deleted_type);
 
     EXPECT_TRUE(state->added_types.none());
   }
 }
 
 // TODO(akalin): Write more SyncBackendHost unit tests.
 
 }  // namespace browser_sync