Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(187)

Unified Diff: components/browser_sync/profile_sync_service_typed_url_unittest.cc

Issue 2388673002: Revert of [Sync] Move //components/sync to the syncer namespace. (patchset #5 id:40001 of https://co (Closed)
Patch Set: Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: components/browser_sync/profile_sync_service_typed_url_unittest.cc
diff --git a/components/browser_sync/profile_sync_service_typed_url_unittest.cc b/components/browser_sync/profile_sync_service_typed_url_unittest.cc
index cded15d4c9c11d3c9755fc2de53e93de6ecbfa04..45d14d292ba5e0c6d358726ec5ec77806233d4b4 100644
--- a/components/browser_sync/profile_sync_service_typed_url_unittest.cc
+++ b/components/browser_sync/profile_sync_service_typed_url_unittest.cc
@@ -61,7 +61,7 @@ const char kDummySavingBrowserHistoryDisabled[] = "dummyPref";
static const int EXPIRED_VISIT = -1;
ACTION(ReturnNewDataTypeManager) {
- return new syncer::DataTypeManagerImpl(arg0, arg1, arg2, arg3, arg4);
+ return new sync_driver::DataTypeManagerImpl(arg0, arg1, arg2, arg3, arg4);
}
class HistoryBackendMock : public HistoryBackend {
@@ -216,7 +216,7 @@ class ProfileSyncServiceTypedUrlTest : public AbstractProfileSyncServiceTest {
// because after shutdown the Sync thread is not returned to the sync
// service, so we could not get the thread's message loop to wait for the
// deletions to be finished.
- sync_service()->RequestStop(syncer::SyncService::CLEAR_DATA);
+ sync_service()->RequestStop(sync_driver::SyncService::CLEAR_DATA);
// Spin the sync thread.
{
base::RunLoop run_loop;
@@ -381,7 +381,7 @@ class ProfileSyncServiceTypedUrlTest : public AbstractProfileSyncServiceTest {
std::unique_ptr<HistoryServiceMock> history_service_;
syncer::DataTypeErrorHandlerMock error_handler_;
std::unique_ptr<TestTypedUrlSyncableService> syncable_service_;
- std::unique_ptr<syncer::FakeSyncClient> sync_client_;
+ std::unique_ptr<sync_driver::FakeSyncClient> sync_client_;
DISALLOW_COPY_AND_ASSIGN(ProfileSyncServiceTypedUrlTest);
};

Powered by Google App Engine
This is Rietveld 408576698