Notify about PageState changes after an AUTO_SUBFRAME commit.

chrome/browser/sessions/session_restore_browsertest.cc

 // Copyright 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 <stddef.h>
 
 #include <vector>
 
 #include "base/base_switches.h"
 #include "base/command_line.h"
@@ skipping 1263 matching lines @@
   // Restore the session by calling chrome::Navigate().
   Browser* new_browser =
       QuitBrowserAndRestoreWithURL(browser(), 3, url3_, true);
   ASSERT_EQ(1u, active_browser_list_->size());
   ASSERT_EQ(3, new_browser->tab_strip_model()->count());
   // Navigated url should be the active tab.
   ASSERT_EQ(url3_,
             new_browser->tab_strip_model()->GetActiveWebContents()->GetURL());
 }
 
+// Ensure that AUTO_SUBFRAME navigations in subframes are restored.
+// See https://crbug.com/638088.
+IN_PROC_BROWSER_TEST_F(SessionRestoreTest, RestoreAfterAutoSubframe) {
+  // Load a page with a blank iframe, then navigate the iframe.  This will be an
+  // auto-subframe commit, and we expect it to be restored.
+  GURL main_url(ui_test_utils::GetTestUrl(
+      base::FilePath(base::FilePath::kCurrentDirectory),
+      base::FilePath(FILE_PATH_LITERAL("iframe_blank.html"))));
+  GURL subframe_url(ui_test_utils::GetTestUrl(
+      base::FilePath(base::FilePath::kCurrentDirectory),
+      base::FilePath(FILE_PATH_LITERAL("title1.html"))));
+  ui_test_utils::NavigateToURL(browser(), main_url);
+  content::TestNavigationObserver observer(
+      browser()->tab_strip_model()->GetActiveWebContents());
+  std::string nav_frame_script =
+      "frames[0].location.href = '" + subframe_url.spec() + "';";
+  EXPECT_TRUE(content::ExecuteScript(

[sky, 2016/08/24 20:25:57]

ASSERT_TRUE? Otherwise if it fails the observer times out, so it seems better to
fail early.

[Charlie Reis, 2016/08/24 20:31:59]

Good idea.  Done.

+      browser()->tab_strip_model()->GetActiveWebContents(), nav_frame_script));
+  observer.Wait();
+
+  // Restore the session.
+  Browser* new_browser = QuitBrowserAndRestore(browser(), 1);
+  ASSERT_EQ(1u, active_browser_list_->size());
+  ASSERT_EQ(1, new_browser->tab_strip_model()->count());
+
+  // The restored page should have the right iframe.
+  ASSERT_EQ(main_url,
+            new_browser->tab_strip_model()->GetActiveWebContents()->GetURL());
+  std::string actual_frame_url;
+  std::string frame_url_script =
+      "window.domAutomationController.send("
+      "frames[0].location.href);";
+  EXPECT_TRUE(content::ExecuteScriptAndExtractString(
+      new_browser->tab_strip_model()->GetActiveWebContents(), frame_url_script,
+      &actual_frame_url));
+  EXPECT_EQ(subframe_url.possibly_invalid_spec(), actual_frame_url);
+}
+
 // Do a clobber restore from the new tab page. This test follows the code path
 // of a crash followed by the user clicking restore from the new tab page.
 IN_PROC_BROWSER_TEST_F(SessionRestoreTest, ClobberRestoreTest) {
   // Create 2 tabs.
   ui_test_utils::NavigateToURL(browser(), url1_);
   ASSERT_EQ(0, browser()->tab_strip_model()->active_index());
   ui_test_utils::NavigateToURLWithDisposition(
       browser(), url2_, NEW_FOREGROUND_TAB,
       ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
   ASSERT_EQ(1, browser()->tab_strip_model()->active_index());
@@ skipping 174 matching lines @@
   // automatically at the start of the test.
   for (size_t i = 1; i < web_contents().size(); i++) {
     GURL expected_url = GURL(kUrls[activation_order[kExpectedNumTabs - i]]);
     ASSERT_EQ(expected_url, web_contents()[i]->GetLastCommittedURL());
     if (i > 0) {
       ASSERT_GT(web_contents()[i - 1]->GetLastActiveTime(),
                 web_contents()[i]->GetLastActiveTime());
     }
   }
 }