chrome/browser/profiles/profile_impl.cc - Issue 944433002: Revamp the MigrateBrowserPrefs and MigrateUserPrefs code.

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/profiles/profile_impl.cc

Issue 944433002: Revamp the MigrateBrowserPrefs and MigrateUserPrefs code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: change asserts to expect in setupuserdatadirectory Created 5 years, 10 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: chrome/browser/profiles/profile_impl.cc

diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc

index 9b7389fc542cb6ec4b5e9f6408f8e529c20c3b50..05bd533d4a6ece678fe3d1b9d5096a95360bb7e8 100644

--- a/chrome/browser/profiles/profile_impl.cc

+++ b/chrome/browser/profiles/profile_impl.cc

@@ -851,11 +851,10 @@ void ProfileImpl::OnPrefsLoaded(bool success) {

return;

}

- // TODO(mirandac): remove migration code after 6 months (crbug.com/69995).

+ // Migrate obsolete prefs.

if (g_browser_process->local_state())

- chrome::MigrateBrowserPrefs(this, g_browser_process->local_state());

- // TODO(ivankr): remove cleanup code eventually (crbug.com/165672).

- chrome::MigrateUserPrefs(this);

+ chrome::MigrateObsoleteBrowserPrefs(this, g_browser_process->local_state());

+ chrome::MigrateObsoleteProfilePrefs(this);

// |kSessionExitType| was added after |kSessionExitedCleanly|. If the pref

// value is empty fallback to checking for |kSessionExitedCleanly|.

« no previous file with comments | « chrome/browser/prefs/pref_service_browsertest.cc ('k') | chrome/chrome_browser_chromeos.gypi » ('j') | no next file with comments »