chrome/browser/sync/test/integration/single_client_password_manager_setting_migrator_service_sync_test.cc - Issue 2887343002: wip 3

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/sync/test/integration/single_client_password_manager_setting_migrator_service_sync_test.cc

Issue 2887343002: wip 3 (Closed)

Patch Set: cleanup Created 3 years, 7 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

« no previous file with comments | « chrome/browser/sync/test/integration/single_client_extensions_sync_test.cc ('k') | chrome/browser/sync/test/integration/single_client_wallet_sync_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/test/integration/single_client_password_manager_setting_migrator_service_sync_test.cc

diff --git a/chrome/browser/sync/test/integration/single_client_password_manager_setting_migrator_service_sync_test.cc b/chrome/browser/sync/test/integration/single_client_password_manager_setting_migrator_service_sync_test.cc

index 0fddb9ab07be9160101e53005df954f34eac4eb8..eb77f394f43ee72cf6fb778ed9047745569d13bd 100644

--- a/chrome/browser/sync/test/integration/single_client_password_manager_setting_migrator_service_sync_test.cc

+++ b/chrome/browser/sync/test/integration/single_client_password_manager_setting_migrator_service_sync_test.cc

@@ -18,7 +18,7 @@

#include "components/sync/protocol/preference_specifics.pb.h"

#include "components/sync/protocol/priority_preference_specifics.pb.h"

#include "components/sync/protocol/sync.pb.h"

-#include "components/sync/test/fake_server/unique_client_entity.h"

+#include "components/sync/test/fake_server/fake_server.h"

#include "components/sync_preferences/pref_service_syncable.h"

#include "components/sync_preferences/pref_service_syncable_observer.h"

#include "content/public/browser/notification_details.h"

@@ -52,7 +52,7 @@ void InjectPreferenceValueToFakeServer(fake_server::FakeServer* fake_server,

pref->set_value(serialized);

const std::string id = "settings_reconciliation";

fake_server->InjectEntity(

- fake_server::UniqueClientEntity::CreateForInjection(id, specifics));

+ syncer::PersistentUniqueClientEntity::CreateForInjection(id, specifics));

}

} // namespace