When sanitizing serialized navigation entries also take iframes into account

components/sessions/content/content_serialized_navigation_driver.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_driver.h"
 
 #include "base/memory/singleton.h"
 #include "components/sessions/serialized_navigation_entry.h"
 #include "content/public/common/page_state.h"
 #include "content/public/common/referrer.h"
@@ skipping 82 matching lines @@
 
 void ContentSerializedNavigationDriver::Sanitize(
     SerializedNavigationEntry* navigation) const {
   content::Referrer old_referrer(
       navigation->referrer_url_,
       static_cast<blink::WebReferrerPolicy>(navigation->referrer_policy_));
   content::Referrer new_referrer =
       content::Referrer::SanitizeForRequest(navigation->virtual_url_,
                                             old_referrer);
 
+  bool page_state_is_valid = navigation->encoded_page_state_.empty() ||
+                             content::PageState::CreateFromEncodedData(
+                                 navigation->encoded_page_state_).IsValid();
+
   // No need to compare the policy, as it doesn't change during
   // sanitization. If there has been a change, the referrer needs to be
   // stripped from the page state as well.
-  if (navigation->referrer_url_ != new_referrer.url) {
+  if (navigation->referrer_url_ != new_referrer.url || !page_state_is_valid) {
     navigation->referrer_url_ = GURL();
     navigation->referrer_policy_ = GetDefaultReferrerPolicy();
     navigation->encoded_page_state_ =
         StripReferrerFromPageState(navigation->encoded_page_state_);
   }
 }
 
 std::string ContentSerializedNavigationDriver::StripReferrerFromPageState(
       const std::string& page_state) const {
   return content::PageState::CreateFromEncodedData(page_state)
       .RemoveReferrer()
       .ToEncodedData();
 }
 
 }  // namespace sessions