Persist offline page info in a navigation entry if needed

components/sessions/content/content_serialized_navigation_builder.cc

 // Copyright 2014 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/content/content_serialized_navigation_builder.h"
 
+#include "base/logging.h"
 #include "components/sessions/content/content_record_password_state.h"
+#include "components/sessions/content/content_serialized_navigation_driver.h"
+#include "components/sessions/content/extended_info_handler.h"
 #include "components/sessions/core/serialized_navigation_entry.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/favicon_status.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/common/page_state.h"
 #include "content/public/common/referrer.h"
 
 namespace sessions {
 
@@ skipping 17 matching lines @@
   navigation.is_overriding_user_agent_ = entry.GetIsOverridingUserAgent();
   navigation.timestamp_ = entry.GetTimestamp();
   navigation.is_restored_ = entry.IsRestored();
   entry.GetExtraData(kSearchTermsKey, &navigation.search_terms_);
   if (entry.GetFavicon().valid)
     navigation.favicon_url_ = entry.GetFavicon().url;
   navigation.http_status_code_ = entry.GetHttpStatusCode();
   navigation.redirect_chain_ = entry.GetRedirectChain();
   navigation.password_state_ = GetPasswordStateFromNavigation(entry);
 
+  for (const auto& handler_entry :
+           ContentSerializedNavigationDriver::GetInstance()->
+               GetAllExtendedInfoHandlers()) {
+    ExtendedInfoHandler* handler = handler_entry.second.get();
+    DCHECK(handler);
+    navigation.extended_info_map_[handler_entry.first] =

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

I think you should only add the entry if GetExtendedInfo() returns a non-empty
string.

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

Done.

+        handler->GetExtendedInfo(entry);
+  }
+
   return navigation;
 }
 
 // static
 std::unique_ptr<content::NavigationEntry>
 ContentSerializedNavigationBuilder::ToNavigationEntry(
     const SerializedNavigationEntry* navigation,
     int page_id,
     content::BrowserContext* browser_context) {
   blink::WebReferrerPolicy policy =
@@ skipping 16 matching lines @@
   entry->SetPageID(page_id);
   entry->SetHasPostData(navigation->has_post_data_);
   entry->SetPostID(navigation->post_id_);
   entry->SetOriginalRequestURL(navigation->original_request_url_);
   entry->SetIsOverridingUserAgent(navigation->is_overriding_user_agent_);
   entry->SetTimestamp(navigation->timestamp_);
   entry->SetExtraData(kSearchTermsKey, navigation->search_terms_);
   entry->SetHttpStatusCode(navigation->http_status_code_);
   entry->SetRedirectChain(navigation->redirect_chain_);
 
+  for (const auto& handler_entry :

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

Rather than iterating over the handlers I think it more natural to iterate over
the extended_info_map_ as that is the thing that needs to be mapped.

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

Done.

+           ContentSerializedNavigationDriver::GetInstance()->
+               GetAllExtendedInfoHandlers()) {
+    const std::string& key = handler_entry.first;
+    if (!navigation->extended_info_map_.count(key))
+      continue;
+    ExtendedInfoHandler* handler = handler_entry.second.get();
+    DCHECK(handler);
+    const std::string& value = navigation->extended_info_map_.at(key);

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

at -> [key] ?

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

I can't use operator[] since navigation is const type.

+    handler->RestoreExtendedInfo(value, entry.get());
+  }
+
   // These fields should have default values.
   DCHECK_EQ(SerializedNavigationEntry::STATE_INVALID,
             navigation->blocked_state_);
   DCHECK_EQ(0u, navigation->content_pack_categories_.size());
 
   return entry;
 }
 
 // static
 std::vector<std::unique_ptr<content::NavigationEntry>>
 ContentSerializedNavigationBuilder::ToNavigationEntries(
     const std::vector<SerializedNavigationEntry>& navigations,
     content::BrowserContext* browser_context) {
   int page_id = 0;
   std::vector<std::unique_ptr<content::NavigationEntry>> entries;
   entries.reserve(navigations.size());
   for (const auto& navigation : navigations) {
     entries.push_back(ToNavigationEntry(&navigation, page_id, browser_context));
     ++page_id;
   }
   return entries;
 }
 
 }  // namespace sessions