Don't commit the blocked URL when a frame is blocked by XFrameOptions.

content/browser/site_per_process_browsertest.cc

 // Copyright (c) 2012 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 "content/browser/site_per_process_browsertest.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 6283 matching lines @@
     // Navigate the subframe to a blocked URL.
     TestNavigationObserver load_observer(shell()->web_contents());
     EXPECT_TRUE(ExecuteScript(
         shell()->web_contents(),
         "frames[0].location.href = '" + blocked_urls[i].spec() + "';"));
     load_observer.Wait();
 
     // The blocked frame's origin should become unique.
     EXPECT_EQ("null", root->child_at(0)->current_origin().Serialize());
 
+    // Ensure that we don't use the blocked URL as the blocked frame's last
+    // committed URL (see https://crbug.com/622385).
+    EXPECT_NE(root->child_at(0)->current_frame_host()->GetLastCommittedURL(),
+              blocked_urls[i]);
+
     // The blocked frame should still fire a load event in its parent's process.
     EXPECT_EQ(expected_title, title_watcher.WaitAndGetTitle());
 
     // Check that the current RenderFrameHost has stopped loading.
     EXPECT_FALSE(root->child_at(0)->current_frame_host()->is_loading());
 
     // The blocked navigation should behave like an empty 200 response. Make
     // sure that the frame's document.title is empty: this double-checks both
     // that the blocked URL's contents wasn't loaded, and that the old page
     // isn't active anymore (both of these pages have non-empty titles).
@@ skipping 894 matching lines @@
   EXPECT_TRUE(is_fullscreen_allowed(root->child_at(0)));
   EXPECT_TRUE(is_fullscreen_allowed(root->child_at(0)->child_at(0)));
 
   // Cross-site navigation should preserve the fullscreen flags.
   NavigateFrameToURL(root->child_at(0)->child_at(0),
                      embedded_test_server()->GetURL("d.com", "/title1.html"));
   EXPECT_TRUE(is_fullscreen_allowed(root->child_at(0)->child_at(0)));
 }
 
 }  // namespace content