| Index: components/sync/driver/sync_service_utils.cc
|
| diff --git a/components/sync/driver/sync_service_utils.cc b/components/sync/driver/sync_service_utils.cc
|
| index 070e85f60df0b18b1159d4f2f2fa9c58ea955cef..c2aeafe97f8423974cb894f94178cf021981de71 100644
|
| --- a/components/sync/driver/sync_service_utils.cc
|
| +++ b/components/sync/driver/sync_service_utils.cc
|
| @@ -7,15 +7,16 @@
|
| #include "components/sync/driver/sync_prefs.h"
|
| #include "components/sync/driver/sync_service.h"
|
|
|
| -namespace syncer {
|
| +namespace sync_driver {
|
|
|
| bool IsTabSyncEnabledAndUnencrypted(SyncService* sync_service,
|
| PrefService* pref_service) {
|
| // Check field trials and settings allow sending the URL on suggest requests.
|
| - SyncPrefs sync_prefs(pref_service);
|
| + sync_driver::SyncPrefs sync_prefs(pref_service);
|
| return sync_service && sync_service->CanSyncStart() &&
|
| - sync_prefs.GetPreferredDataTypes(UserTypes()).Has(PROXY_TABS) &&
|
| - !sync_service->GetEncryptedDataTypes().Has(SESSIONS);
|
| + sync_prefs.GetPreferredDataTypes(syncer::UserTypes())
|
| + .Has(syncer::PROXY_TABS) &&
|
| + !sync_service->GetEncryptedDataTypes().Has(syncer::SESSIONS);
|
| }
|
|
|
| -} // namespace syncer
|
| +} // namespace sync_driver
|
|
|