| Index: sync/engine/cleanup_disabled_types_command_unittest.cc
|
| diff --git a/sync/engine/cleanup_disabled_types_command_unittest.cc b/sync/engine/cleanup_disabled_types_command_unittest.cc
|
| index 79a59fe0cd4c639f4ce27073938197acd5b2c78d..286ca8dfc5b745c6f08621f77ab588b899f92732 100644
|
| --- a/sync/engine/cleanup_disabled_types_command_unittest.cc
|
| +++ b/sync/engine/cleanup_disabled_types_command_unittest.cc
|
| @@ -24,7 +24,7 @@ class CleanupDisabledTypesCommandTest : public MockDirectorySyncerCommandTest {
|
|
|
| virtual void SetUp() {
|
| mutable_routing_info()->clear();
|
| - (*mutable_routing_info())[syncer::BOOKMARKS] = GROUP_PASSIVE;
|
| + (*mutable_routing_info())[BOOKMARKS] = GROUP_PASSIVE;
|
| MockDirectorySyncerCommandTest::SetUp();
|
| }
|
| };
|
| @@ -33,7 +33,7 @@ class CleanupDisabledTypesCommandTest : public MockDirectorySyncerCommandTest {
|
| TEST_F(CleanupDisabledTypesCommandTest, NoPreviousRoutingInfo) {
|
| CleanupDisabledTypesCommand command;
|
| ModelTypeSet expected = ModelTypeSet::All();
|
| - expected.Remove(syncer::BOOKMARKS);
|
| + expected.Remove(BOOKMARKS);
|
| EXPECT_CALL(*mock_directory(),
|
| PurgeEntriesWithTypeIn(HasModelTypes(expected)));
|
| command.ExecuteImpl(session());
|
| @@ -45,7 +45,7 @@ TEST_F(CleanupDisabledTypesCommandTest, NoPurge) {
|
|
|
| ModelSafeRoutingInfo prev(routing_info());
|
| session()->context()->set_previous_session_routing_info(prev);
|
| - (*mutable_routing_info())[syncer::AUTOFILL] = GROUP_PASSIVE;
|
| + (*mutable_routing_info())[AUTOFILL] = GROUP_PASSIVE;
|
| command.ExecuteImpl(session());
|
|
|
| prev = routing_info();
|
| @@ -55,16 +55,16 @@ TEST_F(CleanupDisabledTypesCommandTest, NoPurge) {
|
| TEST_F(CleanupDisabledTypesCommandTest, TypeDisabled) {
|
| CleanupDisabledTypesCommand command;
|
|
|
| - (*mutable_routing_info())[syncer::AUTOFILL] = GROUP_PASSIVE;
|
| - (*mutable_routing_info())[syncer::THEMES] = GROUP_PASSIVE;
|
| - (*mutable_routing_info())[syncer::EXTENSIONS] = GROUP_PASSIVE;
|
| + (*mutable_routing_info())[AUTOFILL] = GROUP_PASSIVE;
|
| + (*mutable_routing_info())[THEMES] = GROUP_PASSIVE;
|
| + (*mutable_routing_info())[EXTENSIONS] = GROUP_PASSIVE;
|
|
|
| ModelSafeRoutingInfo prev(routing_info());
|
| - prev[syncer::PASSWORDS] = GROUP_PASSIVE;
|
| - prev[syncer::PREFERENCES] = GROUP_PASSIVE;
|
| + prev[PASSWORDS] = GROUP_PASSIVE;
|
| + prev[PREFERENCES] = GROUP_PASSIVE;
|
| session()->context()->set_previous_session_routing_info(prev);
|
|
|
| - const ModelTypeSet expected(syncer::PASSWORDS, syncer::PREFERENCES);
|
| + const ModelTypeSet expected(PASSWORDS, PREFERENCES);
|
| EXPECT_CALL(*mock_directory(),
|
| PurgeEntriesWithTypeIn(HasModelTypes(expected)));
|
| command.ExecuteImpl(session());
|
|
|