| 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 8d57f25388e541515a9aedf97a790a4b53a48323..14774a4568c71b0aca9d7a5216047e0c390b546b 100644
|
| --- a/chrome/browser/sync/glue/sync_backend_host_unittest.cc
|
| +++ b/chrome/browser/sync/glue/sync_backend_host_unittest.cc
|
| @@ -46,9 +46,9 @@ class MockSyncFrontend : public SyncFrontend {
|
| const sync_pb::EncryptedData&));
|
| MOCK_METHOD0(OnPassphraseAccepted, void());
|
| MOCK_METHOD2(OnEncryptedTypesChanged,
|
| - void(syncable::ModelTypeSet, bool));
|
| + void(syncer::ModelTypeSet, bool));
|
| MOCK_METHOD0(OnEncryptionComplete, void());
|
| - MOCK_METHOD1(OnMigrationNeededForTypes, void(syncable::ModelTypeSet));
|
| + MOCK_METHOD1(OnMigrationNeededForTypes, void(syncer::ModelTypeSet));
|
| MOCK_METHOD1(OnExperimentsChanged,
|
| void(const syncer::Experiments&));
|
| MOCK_METHOD1(OnActionableError,
|
| @@ -108,7 +108,7 @@ TEST_F(SyncBackendHostTest, InitShutdown) {
|
| backend.Initialize(&mock_frontend,
|
| syncer::WeakHandle<syncer::JsEventHandler>(),
|
| GURL(k_mock_url),
|
| - syncable::ModelTypeSet(),
|
| + syncer::ModelTypeSet(),
|
| credentials,
|
| true,
|
| &handler,
|
|
|