Persist offline page info in a navigation entry if needed

components/sessions/core/serialized_navigation_entry.cc

 // Copyright 2013 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.
 
 #include "components/sessions/core/serialized_navigation_entry.h"
 
 #include <stddef.h>
 
 #include "base/pickle.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 195 matching lines @@
 //
 // type_mask (has_post_data_)
 // referrer_url_
 // referrer_policy_ (broken, crbug.com/450589)
 // original_request_url_
 // is_overriding_user_agent_
 // timestamp_
 // search_terms_
 // http_status_code_
 // referrer_policy_
+// extended_info_map_
 
 void SerializedNavigationEntry::WriteToPickle(int max_size,
                                               base::Pickle* pickle) const {
   pickle->WriteInt(index_);
 
   int bytes_written = 0;
 
   WriteStringToPickle(pickle, &bytes_written, max_size,
                       virtual_url_.spec());
 
@@ skipping 24 matching lines @@
       original_request_url_.is_valid() ?
       original_request_url_.spec() : std::string());
   pickle->WriteBool(is_overriding_user_agent_);
   pickle->WriteInt64(timestamp_.ToInternalValue());
 
   WriteString16ToPickle(pickle, &bytes_written, max_size, search_terms_);
 
   pickle->WriteInt(http_status_code_);
 
   pickle->WriteInt(referrer_policy_);
+
+#if !defined(OS_IOS)
+  pickle->WriteInt(extended_info_map_.size());
+  for (const auto entry : extended_info_map_) {
+    WriteStringToPickle(pickle, &bytes_written, max_size, entry.first);
+    WriteStringToPickle(pickle, &bytes_written, max_size, entry.second);
+  }
+#endif  // !defined(OS_IOS)
 }
 
 bool SerializedNavigationEntry::ReadFromPickle(base::PickleIterator* iterator) {
   *this = SerializedNavigationEntry();
   std::string virtual_url_spec;
   int transition_type_int = 0;
   if (!iterator->ReadInt(&index_) ||
       !iterator->ReadString(&virtual_url_spec) ||
       !iterator->ReadString16(&title_) ||
       !iterator->ReadString(&encoded_page_state_) ||
@@ skipping 58 matching lines @@
       int mapped_referrer_policy;
       if (!SerializedNavigationDriver::Get()->MapReferrerPolicyToNewValues(
               referrer_policy_, &mapped_referrer_policy)) {
         referrer_url_ = GURL();
       }
       referrer_policy_ = mapped_referrer_policy;
       encoded_page_state_ =
           SerializedNavigationDriver::Get()->StripReferrerFromPageState(
               encoded_page_state_);
     }
+
+#if !defined(OS_IOS)
+    int extended_info_map_size = 0;
+    if (iterator->ReadInt(&extended_info_map_size) &&
+        extended_info_map_size >= 0) {

[jianli, 2016/09/29 22:02:29]

Done.

+      for (int i = 0; i < extended_info_map_size; ++i) {
+        std::string key;
+        std::string value;
+        if (iterator->ReadString(&key) && iterator->ReadString(&value))
+          extended_info_map_[key] = value;
+      }
+    } else {

[sky, 2016/09/29 03:08:19]

I don't think you need the else case as everything should be reset by line 272.

[jianli, 2016/09/29 22:02:29]

Done.

+      extended_info_map_.clear();
+    }
+ #endif  // !defined(OS_IOS)
   }
 
   SerializedNavigationDriver::Get()->Sanitize(this);
 
   is_restored_ = true;
 
   return true;
 }
 
 // TODO(zea): perhaps sync state (scroll position, form entries, etc.) as well?
@@ skipping 128 matching lines @@
           redirect_chain_[last_entry].spec());
     }
   }
 
   sync_data.set_is_restored(is_restored_);
 
   return sync_data;
 }
 
 }  // namespace sessions