All Get/Set using the hash_store_id as a key should use *WithoutPathExpansion methods

All Get/Set using the hash_store_id as a key should use *WithoutPathExpansion methods

BUG=349463
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=255227

[gab, 2014-03-05 16:34:29]

Erik, PTAL.

Thanks,
Gab

[erikwright (departed), 2014-03-05 16:46:47]

LGTM.


On Wed, Mar 5, 2014 at 11:34 AM, <gab@chromium.org> wrote:

> Reviewers: erikwright,
>
> Message:
> Erik, PTAL.
>
> Thanks,
> Gab
>
> Description:
> All Get/Set using the hash_store_id as a key should use
> *WithoutPathExpansion
> methods
>
> BUG=349463
>
> Please review this at https://codereview.chromium.org/187443007/
>
> SVN Base: svn://svn.chromium.org/chrome/trunk/src
>
> Affected files (+6, -4 lines):
>   M chrome/browser/prefs/pref_hash_store_impl.cc
>
>
> Index: chrome/browser/prefs/pref_hash_store_impl.cc
> diff --git a/chrome/browser/prefs/pref_hash_store_impl.cc
> b/chrome/browser/prefs/pref_hash_store_impl.cc
> index 1d8f475f7aae31d63ccc82063c2b1c47eabf5762..
> 5e41cb4d8494aed88d1c288c737b8cecbd667cd3 100644
> --- a/chrome/browser/prefs/pref_hash_store_impl.cc
> +++ b/chrome/browser/prefs/pref_hash_store_impl.cc
> @@ -90,13 +90,13 @@ void PrefHashStoreImpl::Reset() {
>    // Remove this store's entry in the kStoreVersionsDict.
>    base::DictionaryValue* version_dict;
>    if (update->GetDictionary(internals::kStoreVersionsDict,
> &version_dict))
> -    version_dict->Remove(hash_store_id_, NULL);
> +    version_dict->RemoveWithoutPathExpansion(hash_store_id_, NULL);
>
>    // Remove this store's entry in the kHashOfHashesDict.
>    base::DictionaryValue* hash_of_hashes_dict;
>    if (update->GetDictionaryWithoutPathExpansion(internals::
> kHashOfHashesDict,
>                                                  &hash_of_hashes_dict)) {
> -    hash_of_hashes_dict->Remove(hash_store_id_, NULL);
> +    hash_of_hashes_dict->RemoveWithoutPathExpansion(hash_store_id_,
> NULL);
>    }
>  }
>
> @@ -116,7 +116,8 @@ PrefHashStoreImpl::StoreVersion
PrefHashStoreImpl::GetCurrentVersion()
> const {
>    int current_version;
>    if (!pref_hash_data->GetDictionary(internals::kStoreVersionsDict,
>                                       &version_dict) ||
> -      !version_dict->GetInteger(hash_store_id_, &current_version)) {
> +      !version_dict->GetIntegerWithoutPathExpansion(hash_store_id_,
> +                                                    &current_version)) {
>      return VERSION_PRE_MIGRATION;
>    }
>
> @@ -189,7 +190,8 @@ PrefHashStoreImpl::PrefHashStoreTransactionImpl::
>      store_versions_dict = new base::DictionaryValue;
>      update->Set(internals::kStoreVersionsDict, store_versions_dict);
>    }
> -  store_versions_dict->SetInteger(outer_->hash_store_id_,
> VERSION_LATEST);
> +  store_versions_dict->SetIntegerWithoutPathExpansion
> (outer_->hash_store_id_,
> +                                                      VERSION_LATEST);
>  }
>
>  PrefHashStoreTransaction::ValueState
>
>
>

To unsubscribe from this group and stop receiving emails from it, send an email
to chromium-reviews+unsubscribe@chromium.org.

[gab, 2014-03-05 17:00:02]

The CQ bit was checked by gab@chromium.org

[commit-bot: I haz the power, 2014-03-05 17:01:07]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/gab@chromium.org/187443007/1

[commit-bot: I haz the power, 2014-03-05 20:21:56]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-03-05 20:21:56]

Try jobs failed on following builders: mac_chromium_rel

[gab, 2014-03-05 20:42:11]

The CQ bit was checked by gab@chromium.org

[commit-bot: I haz the power, 2014-03-05 20:43:59]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/gab@chromium.org/187443007/1

[commit-bot: I haz the power, 2014-03-05 23:59:58]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/gab@chromium.org/187443007/1

[commit-bot: I haz the power, 2014-03-06 02:23:37]

Change committed as 255227