| Index: chrome/browser/prefs/chrome_pref_model_associator_client.cc
|
| diff --git a/chrome/browser/prefs/chrome_pref_model_associator_client.cc b/chrome/browser/prefs/chrome_pref_model_associator_client.cc
|
| index cb2c3fefd494564511fa18ef21c6f006e10012c5..6253199be9da8c371592d072ab908b6c9ee1b5ef 100644
|
| --- a/chrome/browser/prefs/chrome_pref_model_associator_client.cc
|
| +++ b/chrome/browser/prefs/chrome_pref_model_associator_client.cc
|
| @@ -9,20 +9,6 @@
|
| #include "components/content_settings/core/browser/website_settings_info.h"
|
| #include "components/content_settings/core/browser/website_settings_registry.h"
|
|
|
| -namespace {
|
| -// List of migrated preference name pairs. If a preference is migrated
|
| -// (meaning renamed) adding the old and new preference names here will ensure
|
| -// that the sync engine knows how to deal with the synced values coming in
|
| -// with the old name. Preference migration itself doesn't happen here. It may
|
| -// happen in session_startup_pref.cc.
|
| -const struct MigratedPreferences {
|
| - const char* const old_name;
|
| - const char* const new_name;
|
| -} kMigratedPreferences[] = {
|
| - {prefs::kURLsToRestoreOnStartupOld, prefs::kURLsToRestoreOnStartup},
|
| -};
|
| -} // namespace
|
| -
|
| // static
|
| ChromePrefModelAssociatorClient*
|
| ChromePrefModelAssociatorClient::GetInstance() {
|
| @@ -48,27 +34,3 @@ bool ChromePrefModelAssociatorClient::IsMergeableDictionaryPreference(
|
| }
|
| return false;
|
| }
|
| -
|
| -bool ChromePrefModelAssociatorClient::IsMigratedPreference(
|
| - const std::string& new_pref_name,
|
| - std::string* old_pref_name) const {
|
| - for (size_t i = 0; i < arraysize(kMigratedPreferences); ++i) {
|
| - if (new_pref_name == kMigratedPreferences[i].new_name) {
|
| - old_pref_name->assign(kMigratedPreferences[i].old_name);
|
| - return true;
|
| - }
|
| - }
|
| - return false;
|
| -}
|
| -
|
| -bool ChromePrefModelAssociatorClient::IsOldMigratedPreference(
|
| - const std::string& old_pref_name,
|
| - std::string* new_pref_name) const {
|
| - for (size_t i = 0; i < arraysize(kMigratedPreferences); ++i) {
|
| - if (old_pref_name == kMigratedPreferences[i].old_name) {
|
| - new_pref_name->assign(kMigratedPreferences[i].new_name);
|
| - return true;
|
| - }
|
| - }
|
| - return false;
|
| -}
|
|
|