diff options
| author | dpapad@chromium.org <dpapad@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-24 19:27:21 +0000 |
|---|---|---|
| committer | dpapad@chromium.org <dpapad@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-24 19:27:21 +0000 |
| commit | 7500c55e2fc2219e50e3b6b40e6c8e3ed3820d20 (patch) | |
| tree | 7c5c4d5165d1c10380ef60f9358993b36365e434 /chrome/browser/prefs/pref_service.cc | |
| parent | b816c284c9b1972f8118a7d432929fe08285351a (diff) | |
| download | chromium_src-7500c55e2fc2219e50e3b6b40e6c8e3ed3820d20.zip chromium_src-7500c55e2fc2219e50e3b6b40e6c8e3ed3820d20.tar.gz chromium_src-7500c55e2fc2219e50e3b6b40e6c8e3ed3820d20.tar.bz2 | |
Revert 133740 - Fix homepage migration for users who never changed their settings.
This caused chromium os tests to fail, http://build.chromium.org/p/chromium.chromiumos/builders/Linux%20ChromiumOS%20Tests%20%281%29/builds/1981/steps/unit_tests/logs/DefaultMigrationHomepageIsNTP
BUG=122936
TEST=Upgrade from 18 to 19
TBR=ben@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10049005
TBR=tbreisacher@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10173007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@133746 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/prefs/pref_service.cc')
| -rw-r--r-- | chrome/browser/prefs/pref_service.cc | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/chrome/browser/prefs/pref_service.cc b/chrome/browser/prefs/pref_service.cc index ea1d705..de7f406 100644 --- a/chrome/browser/prefs/pref_service.cc +++ b/chrome/browser/prefs/pref_service.cc @@ -684,31 +684,6 @@ const DictionaryValue* PrefService::GetDictionary(const char* path) const { return static_cast<const DictionaryValue*>(value); } -const base::Value* PrefService::GetUserPrefValue(const char* path) const { - DCHECK(CalledOnValidThread()); - - const Preference* pref = FindPreference(path); - if (!pref) { - NOTREACHED() << "Trying to get an unregistered pref: " << path; - return NULL; - } - - // Look for an existing preference in the user store. If it doesn't - // exist, return NULL. - base::Value* value = NULL; - if (user_pref_store_->GetMutableValue(path, &value) != - PersistentPrefStore::READ_OK) { - return NULL; - } - - if (!value->IsType(pref->GetType())) { - NOTREACHED() << "Pref value type doesn't match registered type."; - return NULL; - } - - return value; -} - const ListValue* PrefService::GetList(const char* path) const { DCHECK(CalledOnValidThread()); |