| Index: chrome/browser/sync/glue/sync_backend_host_unittest.cc
|
| diff --git a/chrome/browser/sync/glue/sync_backend_host_unittest.cc b/chrome/browser/sync/glue/sync_backend_host_unittest.cc
|
| index ec6ca67483b76ca24eb9ca28d89efb73acd40821..f9427aa4adcc4c70d4277fed1fb24f8f4f2f0b27 100644
|
| --- a/chrome/browser/sync/glue/sync_backend_host_unittest.cc
|
| +++ b/chrome/browser/sync/glue/sync_backend_host_unittest.cc
|
| @@ -124,7 +124,6 @@ TEST_F(SyncBackendHostTest, MakePendingConfigModeState) {
|
| 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());
|
| }
|
|
|
| @@ -143,7 +142,6 @@ TEST_F(SyncBackendHostTest, MakePendingConfigModeState) {
|
| 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());
|
| }
|
|
|
| @@ -166,7 +164,6 @@ TEST_F(SyncBackendHostTest, MakePendingConfigModeState) {
|
| 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);
|
| @@ -192,7 +189,6 @@ TEST_F(SyncBackendHostTest, MakePendingConfigModeState) {
|
| 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());
|
| }
|
|
|
| @@ -214,7 +210,6 @@ TEST_F(SyncBackendHostTest, MakePendingConfigModeState) {
|
| 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());
|
| }
|
|
|
| @@ -235,7 +230,6 @@ TEST_F(SyncBackendHostTest, MakePendingConfigModeState) {
|
| 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);
|
| @@ -258,7 +252,6 @@ TEST_F(SyncBackendHostTest, MakePendingConfigModeState) {
|
| 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());
|
| }
|
|
|