Moved TabID implementation to SerializableUserData.

ios/web/navigation/serializable_user_data_manager_impl.mm

 // Copyright 2017 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "ios/web/navigation/serializable_user_data_manager_impl.h"
 
 #import "base/mac/foundation_util.h"
 #import "ios/web/public/web_state/web_state.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
@@ skipping 41 matching lines @@
   }
 };
 }  // namespace
 
 // static
 std::unique_ptr<SerializableUserData> SerializableUserData::Create() {
   return std::unique_ptr<SerializableUserData>(new SerializableUserDataImpl());
 }
 
 SerializableUserDataImpl::SerializableUserDataImpl()
-    : data_([[NSDictionary alloc] init]) {}
+    : data_([[NSDictionary alloc] init]),
+      legacy_key_conversions_(@{@"tabId" : @"TabID"}) {}

[Eugene But (OOO till 7-30), 2017/02/13 17:37:57]

Should we keep the old tabId name to avoid extra complexity?

[kkhorimoto, 2017/02/13 23:41:18]

Since we've set a milestone to remove the legacy conversion, I think this is
okay for the short term.  I'd prefer to use serialization keys that more closely
match the style of the style of the property name.

 
 SerializableUserDataImpl::~SerializableUserDataImpl() {}
 
 SerializableUserDataImpl::SerializableUserDataImpl(NSDictionary* data)
     : data_([data copy]) {}
 
 void SerializableUserDataImpl::Encode(NSCoder* coder) {
   [coder encodeObject:data_ forKey:kSerializedUserDataKey];
 }
 
 void SerializableUserDataImpl::Decode(NSCoder* coder) {
-  NSDictionary* data = base::mac::ObjCCastStrict<NSDictionary>(
-      [coder decodeObjectForKey:kSerializedUserDataKey]);
-  data_.reset([data mutableCopy]);
+  NSMutableDictionary* data =
+      [[coder decodeObjectForKey:kSerializedUserDataKey] mutableCopy];
+  [data addEntriesFromDictionary:GetDecodedLegacyValues(coder)];
+  data_.reset([data copy]);
+}
+
+NSDictionary* SerializableUserDataImpl::GetDecodedLegacyValues(NSCoder* coder) {
+  NSMutableDictionary* legacy_values = [[NSMutableDictionary alloc] init];
+  for (NSString* legacy_key in [legacy_key_conversions_ allKeys]) {
+    id<NSCoding> value = [coder decodeObjectForKey:legacy_key];
+    NSString* new_key = [legacy_key_conversions_ objectForKey:legacy_key];
+    legacy_values[new_key] = value;
+  }
+  return legacy_values;
 }
 
 // static
 SerializableUserDataManager* SerializableUserDataManager::FromWebState(
     web::WebState* web_state) {
   DCHECK(web_state);
   return SerializableUserDataManagerWrapper::FromWebState(web_state)->manager();
 }
 
 SerializableUserDataManagerImpl::SerializableUserDataManagerImpl()
@@ skipping 21 matching lines @@
 
 void SerializableUserDataManagerImpl::AddSerializableUserData(
     SerializableUserData* data) {
   DCHECK(data);
   SerializableUserDataImpl* data_impl =
       static_cast<SerializableUserDataImpl*>(data);
   data_.reset([data_impl->data() mutableCopy]);
 }
 
 }  // namespace web