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

Unified Diff: components/password_manager/sync/browser/password_manager_setting_migrator_service.h

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/password_manager/sync/browser/password_manager_setting_migrator_service.h
diff --git a/components/password_manager/sync/browser/password_manager_setting_migrator_service.h b/components/password_manager/sync/browser/password_manager_setting_migrator_service.h
index 14d35ce0680720e00d27896dd4b82031eaad4b72..4f35a064160876ad0616338241b6f15e50b0f95b 100644
--- a/components/password_manager/sync/browser/password_manager_setting_migrator_service.h
+++ b/components/password_manager/sync/browser/password_manager_setting_migrator_service.h
@@ -5,7 +5,6 @@
#ifndef COMPONENTS_PASSWORD_MANAGER_SYNC_BROWSER_PASSWORD_MANAGER_SETTING_MIGRATOR_SERVICE_H_
#define COMPONENTS_PASSWORD_MANAGER_SYNC_BROWSER_PASSWORD_MANAGER_SETTING_MIGRATOR_SERVICE_H_
-#include <string>
#include <vector>
#include "base/macros.h"
@@ -14,7 +13,7 @@
#include "components/prefs/pref_change_registrar.h"
#include "components/syncable_prefs/pref_service_syncable_observer.h"
-namespace syncer {
+namespace sync_driver {
class SyncService;
}
@@ -88,7 +87,7 @@ class PasswordManagerSettingMigratorService
// PrefServiceSyncableObserver:
void OnIsSyncingChanged() override;
- void InitializeMigration(syncer::SyncService* sync_service);
+ void InitializeMigration(sync_driver::SyncService* sync_service);
// Only use for testing.
static void set_force_disabled_for_testing(bool force_disabled) {
@@ -148,7 +147,7 @@ class PasswordManagerSettingMigratorService
bool initial_legacy_pref_value_;
syncable_prefs::PrefServiceSyncable* prefs_;
- syncer::SyncService* sync_service_;
+ sync_driver::SyncService* sync_service_;
PrefChangeRegistrar pref_change_registrar_;

Powered by Google App Engine
This is Rietveld 408576698