Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / prefs / pref_hash_store_impl.cc

diff --git a/src/chrome/browser/prefs/pref_hash_store_impl.cc b/src/chrome/browser/prefs/pref_hash_store_impl.cc
index afe2dd1..a1af2b2 100644 (file)
--- a/src/chrome/browser/prefs/pref_hash_store_impl.cc
+++ b/src/chrome/browser/prefs/pref_hash_store_impl.cc
@@ -142,8 +142,6 @@ PrefHashStoreImpl::PrefHashStoreTransactionImpl::CheckValue(
   switch (validation_result) {
     case PrefHashCalculator::VALID:
       return UNCHANGED;
-    case PrefHashCalculator::VALID_WEAK_LEGACY:
-      return WEAK_LEGACY;
     case PrefHashCalculator::VALID_SECURE_LEGACY:
       return SECURE_LEGACY;
     case PrefHashCalculator::INVALID:
@@ -201,13 +199,6 @@ PrefHashStoreImpl::PrefHashStoreTransactionImpl::CheckSplitValue(
           keyed_path, &it.value(), entry->second)) {
         case PrefHashCalculator::VALID:
           break;
-        case WEAK_LEGACY:
-          // Split tracked preferences were introduced after the migration from
-          // the weaker legacy algorithm started so no migration is expected,
-          // but declare it invalid in Release builds anyways.
-          NOTREACHED();
-          invalid_keys->push_back(it.key());
-          break;
         case SECURE_LEGACY:
           // Secure legacy device IDs based hashes are still accepted, but we
           // should make sure to notify the caller for him to update the legacy